From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 12 Sep 2016 22:34:37 +0000 (-0700)
Subject: Merge branch 'js/t6026-clean-up'
X-Git-Tag: v2.11.0-rc0~158
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ba06991e5f1647d8a78b181562f4d8075c65c696;p=thirdparty%2Fgit.git

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

ba06991e5f1647d8a78b181562f4d8075c65c696