Merge branch 'js/t6026-clean-up' into maint
commit8e2653586621c3e4579331dea2aad5010fb5926c
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Sep 2016 20:51:41 +0000 (19 13:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Sep 2016 20:51:41 +0000 (19 13:51 -0700)
tree6e8c9707586cbb7a8bfc23aecb44e47d481b4873
parentd6645312ff82245a8e9bc8187ad16c57456bff38
parent5babb5bdb3d09ee670f7e3a3ae596eb2f1d02268
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