diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-11-29 14:14:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-29 14:14:42 -0800 |
| commit | e1355547fd30b21fbdc3fe4e576759683777c4ce (patch) | |
| tree | fe30cc6279cff37e45ae2e4698efc7eb6c7bd380 | |
| parent | SVN import: Use one log call (diff) | |
| download | tgif-e1355547fd30b21fbdc3fe4e576759683777c4ce.tar.xz | |
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>
| -rwxr-xr-x | git-applymbox.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |