projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0538b84 fdf4f6c)
Merge branch 'as/merge-attr-sleep'
authorJunio C Hamano <gitster@pobox.com>
Fri, 11 Nov 2016 21:56:30 +0000 (13:56 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 11 Nov 2016 21:56:30 +0000 (13:56 -0800)
commitf5a8ad4c5a2c89555b728ccbaad04bf416cc4274
tree3f38bde5dd0bf9e612131ad94440e10a41cb97d5tree | snapshot
parent0538b84027a8aba7e8b805e3ec8fceb3990023e5commit | diff
parentfdf4f6c79b4260e98729ebeb208036765595e9accommit | diff
Merge branch 'as/merge-attr-sleep'

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.