Revert "t6026-merge-attr: ensure that the merge driver was called"

gitster · gitster · commit 3b03097d66ec · 2016-11-10T15:54:12.000-08:00
This reverts commit c1e0dc5. We are not interested in the stray process in the merge driver started; we want it to be still around.
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -193,8 +193,7 @@ test_expect_success 'custom merge does not lock index' '`
`193`	`193`	`"* merge=ours" "text merge=sleep-one-second" &&`
`194`	`194`	`test_config merge.ours.driver true &&`
`195`	`195`	`test_config merge.sleep-one-second.driver ./sleep-one-second.sh &&`
`196`		`- git merge master &&`
`197`		`- test -f sleep.pid`
	`196`	`+ git merge master`
`198`	`197`	`'`
`199`	`198`
`200`	`199`	`test_done`