From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 29 Nov 2016 21:27:56 +0000 (-0800)
Subject: Merge branch 'as/merge-attr-sleep' into maint
X-Git-Tag: v2.10.3~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25e298d2c9f0b4ecd4fc668192a7112e89783d84;p=thirdparty%2Fgit.git

Merge branch 'as/merge-attr-sleep' into maint

Fix for a racy false-positive test failure.

* as/merge-attr-sleep:
  t6026: clarify the point of "kill $(cat sleep.pid)"
  t6026: ensure that long-running script really is
  Revert "t6026-merge-attr: don't fail if sleep exits early"
  Revert "t6026-merge-attr: ensure that the merge driver was called"
  t6026-merge-attr: ensure that the merge driver was called
  t6026-merge-attr: don't fail if sleep exits early
---

25e298d2c9f0b4ecd4fc668192a7112e89783d84