Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
dir.c::test_one_path(): work around directory_exists_in_index_icase() breakage
[gitweb.git]
/
t
/
t7601-merge-pull-config.sh
diff --git
a/t/t7601-merge-pull-config.sh
b/t/t7601-merge-pull-config.sh
index b44b29395049308b30e61b00a55e2eb39f4355a1..25dac798894f6a3cb4b62c8b9ba944bfc1d82d9f 100755
(executable)
--- a/
t/t7601-merge-pull-config.sh
+++ b/
t/t7601-merge-pull-config.sh
@@
-109,7
+109,7
@@
test_expect_success 'setup conflicted merge' '
'
# First do the merge with resolve and recursive then verify that
-# recusive is cho
o
sen.
+# recusive is chosen.
test_expect_success 'merge picks up the best result' '
git config --unset-all pull.twohead &&