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.
Junio C Hamano committed
Nov 10, 2016 at 15:54 UTC
3b03097d66ecc5798d1c289b84adc4a02b12cd7c
1 file changed
+1
-2
t/t6026-merge-attr.sh
+1
-2
@@ -193,8 +193,7 @@ test_expect_success 'custom merge does not lock index' '
193
"* merge=ours" "text merge=sleep-one-second" &&
194
test_config merge.ours.driver true &&
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
197
'
198
199
test_done