Fix off-by-one error in git-merge
'git-merge -s' without a strategy name does not fail and does not give usage as it should. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Sep 12, 2005 at 22:20 UTC
f88ed172e7a391bd907798ad2a3347a83cd24317
1 file changed
+1
-1
git-merge.sh
+1
-1
@@ -43,7 +43,7 @@ do
43
case "$#,$1" in
44
*,*=*)
45
strategy=`expr "$1" : '-[^=]*=\(.*\)'` ;;
46
- 0,*)
46
+ 1,*)
47
usage ;;
48
*)
49
strategy="$2"