From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 19 Sep 2016 20:51:41 +0000 (-0700)
Subject: Merge branch 'js/t6026-clean-up' into maint
X-Git-Tag: v2.10.1~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8e2653586621c3e4579331dea2aad5010fb5926c;p=thirdparty%2Fgit.git

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
---

8e2653586621c3e4579331dea2aad5010fb5926c