Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
t5000-t5999: fix broken &&-chains
[gitweb.git]
/
t
/
t7201-co.sh
diff --git
a/t/t7201-co.sh
b/t/t7201-co.sh
index ab9da61da391f1b6040076dda2454f602adef7d2..8d8a63a24be023b2a615bed1aa51c6812d8cbb83 100755
(executable)
--- a/
t/t7201-co.sh
+++ b/
t/t7201-co.sh
@@
-673,7
+673,6
@@
test_expect_success 'custom merge driver with checkout -m' '
do
grep $t arm || exit 1
done
- exit 0
) &&
mv arm expect &&