Commit e4f5b8c6 authored by Junio C Hamano's avatar Junio C Hamano

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: default avatarJunio C Hamano <[email protected]>
parent ace1534d
......@@ -8,7 +8,7 @@
#
case "$#" in
2)
1)
echo >&2 "cannot handle unmerged diff on path $1."
exit 1 ;;
esac
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment