Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'maint'
[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 6081677d234f1fcb88b6b9160f707ebf0274f38a..de977c5e2f0b270c57bbea9daaf8e22eefdf8560 100755
(executable)
--- a/
t/t7604-merge-custom-message.sh
+++ b/
t/t7604-merge-custom-message.sh
@@
-1,6
+1,6
@@
#!/bin/sh
-test_description='git
-
merge
+test_description='git
merge
Testing merge when using a custom message for the merge commit.'