From: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Date: Sat, 21 Oct 2006 18:51:04 +0000 (+0200)
Subject: git-merge: show usage if run without arguments
X-Git-Tag: v1.4.3.2~12
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fc61e313da0a124e9f6a213cd76944a8c4e6c918;p=git.git

git-merge: show usage if run without arguments

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

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