From: Junio C Hamano <junkio@cox.net>
Date: Tue, 13 Sep 2005 05:20:42 +0000 (-0700)
Subject: Fix off-by-one error in git-merge
X-Git-Tag: v0.99.7~55
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f88ed172e7a391bd907798ad2a3347a83cd24317?hp=f88ed172e7a391bd907798ad2a3347a83cd24317

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>
---