git-merge: show usage if run without arguments
authorRene Scharfe <rene.scharfe@lsrfire.ath.cx>
Sat, 21 Oct 2006 18:51:04 +0000 (20:51 +0200)
committerJunio C Hamano <junkio@cox.net>
Sun, 22 Oct 2006 19:15:55 +0000 (12:15 -0700)
commitfc61e313da0a124e9f6a213cd76944a8c4e6c918
treeb6f5b574c5787e446adfaefb2e3c7b1caa4ffe65
parent0b92f1a9d213644d2cd6c1870091c090a6b7eca9
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