Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Move convert-objects to contrib.
[gitweb.git]
/
git-merge.sh
diff --git
a/git-merge.sh
b/git-merge.sh
index 66e48b3b18061e083021d8a5c15d252fbb1988ff..6c513dcbdf44036b0207c276e765a87eceb7aa77 100755
(executable)
--- a/
git-merge.sh
+++ b/
git-merge.sh
@@
-135,7
+135,7
@@
merge_name () {
case "$#" in 0) usage ;; esac
have_message=
-while
case "$#" in 0) break ;; esac
+while
test $# != 0
do
case "$1" in
-n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\