From 3b03097d66ecc5798d1c289b84adc4a02b12cd7c Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 10 Nov 2016 15:54:12 -0800 Subject: [PATCH] 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. --- t/t6026-merge-attr.sh | 3 +-- 1 file changed, 1 insertion(+), 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 -- 2.11.4.GIT