projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bb6bc68 fdf4f6c)
Merge branch 'as/merge-attr-sleep' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 29 Nov 2016 21:27:56 +0000 (13:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 29 Nov 2016 21:27:56 +0000 (13:27 -0800)
commit25e298d2c9f0b4ecd4fc668192a7112e89783d84
tree83f05c48e91c366ca52e0cb1093c6a22ef85c9batree | snapshot
parentbb6bc68d226d3dad2f339fe180ed3f6542fe7649commit | diff
parentfdf4f6c79b4260e98729ebeb208036765595e9accommit | diff
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
Unnamed repository; edit this file 'description' to name the repository.