t6026-merge-attr: ensure that the merge driver was called
Explicitly check for the existence of the pid file to test that the merge driver was actually called. Signed-off-by: Andreas Schwab <schwab@suse.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Andreas Schwab committed
Nov 10, 2016 at 09:31 UTC
c1e0dc59bddce765761a6f863c66ee0cd4b2ca09
1 file changed
+2
-1
t/t6026-merge-attr.sh
+2
-1
@@ -193,7 +193,8 @@ 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
196
+ git merge master &&
197
+ test -f sleep.pid
198
'
199
200
test_done