mirror of
https://github.com/git/git
synced 2024-10-28 19:25:47 +00:00
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>
This commit is contained in:
parent
22c67ca88e
commit
f88ed172e7
1 changed files with 1 additions and 1 deletions
|
@ -43,7 +43,7 @@ do
|
|||
case "$#,$1" in
|
||||
*,*=*)
|
||||
strategy=`expr "$1" : '-[^=]*=\(.*\)'` ;;
|
||||
0,*)
|
||||
1,*)
|
||||
usage ;;
|
||||
*)
|
||||
strategy="$2"
|
||||
|
|
Loading…
Reference in a new issue