From: Junio C Hamano <junkio@cox.net>
Date: Tue, 29 Nov 2005 22:14:42 +0000 (-0800)
Subject: applymbox: typofix to enable -m option.
X-Git-Tag: v0.99.9l^2~24^2~4
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=e1355547fd30b21fbdc3fe4e576759683777c4ce;p=git.git

applymbox: typofix to enable -m option.

The -m option to fall back on 3-way merge was not honoured at
all because of a typo.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-applymbox.sh b/git-applymbox.sh
index 24d4a8cb..c686cc8d 100755
--- a/git-applymbox.sh
+++ b/git-applymbox.sh
@@ -33,7 +33,7 @@ do
 	-k)	keep_subject=-k ;;
 	-q)	query_apply=t ;;
 	-c)	continue="$2"; resume=f; shift ;;
-	-m)	fallback_3way=t ;;
+	-m)	fall_back_3way=t ;;
 	-*)	usage ;;
 	*)	break ;;
 	esac