Fix thinko in the logic to refuse unmerged path fed to git-apply-patch-script.
commite4f5b8c69d5f29b2b95b1febe76ccd91d1dffb33
authorJunio C Hamano <junkio@cox.net>
Sat, 7 May 2005 07:48:00 +0000 (7 00:48 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 7 May 2005 07:48:00 +0000 (7 00:48 -0700)
tree609a94edaa42aeb4f8293f115a100b12c2e069b0
parentace1534d6f3a710ed82e7e27ba1fe77c0c278695
Fix thinko in the logic to refuse unmerged path fed to git-apply-patch-script.

An unmerged path is given as the sole parameter to the script, so it
should check against $# being 1, not 2.

Signed-off-by: Junio C Hamano <junkio@cox.net>
git-apply-patch-script