Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
t6026-merge-attr: ensure that the merge driver was called
[gitweb.git]
/
t
/
t6026-merge-attr.sh
diff --git
a/t/t6026-merge-attr.sh
b/t/t6026-merge-attr.sh
index 2672b15aa3d0df9ad45027bbc91c1c66b4b5c199..03d13d00b5a249bd3aae89131cbeddac0e054bf1 100755
(executable)
--- a/
t/t6026-merge-attr.sh
+++ b/
t/t6026-merge-attr.sh
@@
-193,7
+193,8
@@
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
+ git merge master &&
+ test -f sleep.pid
'
test_done