diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-11-29 13:27:56 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-11-29 13:27:56 -0800 |
| commit | 25e298d2c9f0b4ecd4fc668192a7112e89783d84 (patch) | |
| tree | 83f05c48e91c366ca52e0cb1093c6a22ef85c9ba /Documentation/git-diff-index.txt | |
| parent | Merge branch 'ak/sh-setup-dot-source-i18n-fix' into maint (diff) | |
| parent | t6026: clarify the point of "kill $(cat sleep.pid)" (diff) | |
| download | tgif-25e298d2c9f0b4ecd4fc668192a7112e89783d84.tar.xz | |
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
Diffstat (limited to 'Documentation/git-diff-index.txt')
0 files changed, 0 insertions, 0 deletions