Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
git-svn.perl: fix a false-positive in the "already exists" test
[gitweb.git]
/
t
/
t7604-merge-custom-message.sh
diff --git
a/t/t7604-merge-custom-message.sh
b/t/t7604-merge-custom-message.sh
index 9114785ef7c850ae2d393bed3565e13f11339ba0..89619cf44608282efa6d75c2ed93cd3bdc4096fc 100755
(executable)
--- a/
t/t7604-merge-custom-message.sh
+++ b/
t/t7604-merge-custom-message.sh
@@
-11,7
+11,7
@@
create_merge_msgs() {
cp exp.subject exp.log &&
echo >>exp.log "" &&
- echo >>exp.log "*
commit
'c2':" &&
+ echo >>exp.log "*
tag
'c2':" &&
echo >>exp.log " c2"
}