Fix off-by-one error in git-merge
authorJunio C Hamano <junkio@cox.net>
Tue, 13 Sep 2005 05:20:42 +0000 (22:20 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 13 Sep 2005 05:52:52 +0000 (22:52 -0700)
'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>
No differences found