Merge branch 'js/t6026-clean-up'

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 12, 2016 at 15:34 UTC ba06991e5f1647d8a78b181562f4d8075c65c696

No changes.