Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
t9104: fix test for following larger parents
[gitweb.git]
/
t
/
t6200-fmt-merge-msg.sh
diff --git
a/t/t6200-fmt-merge-msg.sh
b/t/t6200-fmt-merge-msg.sh
index 54b5744cc526e172acb79bb204af1800fdceb315..2e2fb0e9572f3d570311470aebf47da37974b8f8 100755
(executable)
--- a/
t/t6200-fmt-merge-msg.sh
+++ b/
t/t6200-fmt-merge-msg.sh
@@
-194,7
+194,7
@@
test_expect_success '--log=5 with custom comment character' '
'
test_expect_success 'merge.log=0 disables shortlog' '
- echo "Merge branch ${apos}left${apos}" >expected
+ echo "Merge branch ${apos}left${apos}" >expected
&&
git -c merge.log=0 fmt-merge-msg <.git/FETCH_HEAD >actual &&
test_cmp expected actual
'