diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-11-11 13:56:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-11-11 13:56:30 -0800 |
| commit | f5a8ad4c5a2c89555b728ccbaad04bf416cc4274 (patch) | |
| tree | 3f38bde5dd0bf9e612131ad94440e10a41cb97d5 /t/t3030-merge-recursive.sh | |
| parent | Merge branch 'jk/alt-odb-cleanup' (diff) | |
| parent | t6026: clarify the point of "kill $(cat sleep.pid)" (diff) | |
| download | tgif-f5a8ad4c5a2c89555b728ccbaad04bf416cc4274.tar.xz | |
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
Diffstat (limited to 't/t3030-merge-recursive.sh')
0 files changed, 0 insertions, 0 deletions