Merge branch 'js/t6026-clean-up' into maint

A test spawned a short-lived background process, which sometimes prevented the test directory from getting removed at the end of the script on some platforms. * js/t6026-clean-up: t6026-merge-attr: clean up background process at end of test case

Junio C Hamano committed Sep 19, 2016 at 13:51 UTC 8e2653586621c3e4579331dea2aad5010fb5926c

No changes.