Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
status: disable display of '#' comment prefix by default
[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..830a4c3e9dffc7963dda03139be6c4e66fddf10f 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
-# recu
sive is cho
osen.
+# recu
rsive is ch
osen.
test_expect_success 'merge picks up the best result' '
git config --unset-all pull.twohead &&