X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-merge.sh;h=789f4de595d2657c9c348b4d52b47e2c42543ad2;hb=ddaf73141c03aeaab5e8cf5fadaf8b7ebad7955b;hp=5b34b4de99c33a99dfb841795baced8889f74a88;hpb=1ad7a06adb6fbe42357daa58738008cbadbb8650;p=git.git

diff --git a/git-merge.sh b/git-merge.sh
index 5b34b4de9..789f4de59 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