diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-11-10 15:54:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-11-10 15:54:12 -0800 |
| commit | 3b03097d66ecc5798d1c289b84adc4a02b12cd7c (patch) | |
| tree | 074ff9fce2f8949b146f89e5ea895033513e3c7a /t/t6026-merge-attr.sh | |
| parent | c1e0dc59bddce765761a6f863c66ee0cd4b2ca09 (diff) | |
| download | git-3b03097d66ecc5798d1c289b84adc4a02b12cd7c.tar.gz | |
Revert "t6026-merge-attr: ensure that the merge driver was called"
This reverts commit c1e0dc59bddce765761a6f863c66ee0cd4b2ca09.
We are not interested in the stray process in the merge driver
started; we want it to be still around.
Diffstat (limited to 't/t6026-merge-attr.sh')
| -rwxr-xr-x | t/t6026-merge-attr.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/t/t6026-merge-attr.sh b/t/t6026-merge-attr.sh index 03d13d00b5..2672b15aa3 100755 --- a/t/t6026-merge-attr.sh +++ b/t/t6026-merge-attr.sh @@ -193,8 +193,7 @@ test_expect_success 'custom merge does not lock index' ' "* merge=ours" "text merge=sleep-one-second" && test_config merge.ours.driver true && test_config merge.sleep-one-second.driver ./sleep-one-second.sh && - git merge master && - test -f sleep.pid + git merge master ' test_done |