From fc61e313da0a124e9f6a213cd76944a8c4e6c918 Mon Sep 17 00:00:00 2001
From: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Date: Sat, 21 Oct 2006 20:51:04 +0200
Subject: [PATCH] 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>
---
 git-merge.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/git-merge.sh b/git-merge.sh
index 5b34b4de99..789f4de595 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
-- 
2.11.4.GIT