From e1355547fd30b21fbdc3fe4e576759683777c4ce Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 29 Nov 2005 14:14:42 -0800 Subject: 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 --- git-applymbox.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-applymbox.sh b/git-applymbox.sh index 24d4a8cb4e..c686cc8d27 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 -- cgit v1.2.3