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.

diff --git a/t/t6026-merge-attr.sh b/t/t6026-merge-attr.sh
index 03d13d00b5a249bd3aae89131cbeddac0e054bf1..2672b15aa3d0df9ad45027bbc91c1c66b4b5c199 100755 (executable)
--- 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