X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=git-merge.sh;h=cb094388bb5c830d37a790f5e7bbf13e8c61352a;hb=91fd2bf3fdc72351532a8fd74cdd0da37b036ed1;hp=49c46d55df3491460864b3afd751258ec8ec97c7;hpb=32788ad6f892aeafad3cd2bcb8807091f7c404d7;p=git.git

diff --git a/git-merge.sh b/git-merge.sh
index 49c46d55d..cb094388b 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -93,6 +93,8 @@ finish () {
 	esac
 }
 
+case "$#" in 0) usage ;; esac
+
 rloga=
 while case "$#" in 0) break ;; esac
 do