summaryrefslogtreecommitdiff
path: root/git-applymbox.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-29 22:14:42 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-29 22:14:42 (GMT)
commite1355547fd30b21fbdc3fe4e576759683777c4ce (patch)
treefe30cc6279cff37e45ae2e4698efc7eb6c7bd380 /git-applymbox.sh
parent034908047d8c46fb4e1323285b3b066567c7fadc (diff)
downloadgit-e1355547fd30b21fbdc3fe4e576759683777c4ce.zip
git-e1355547fd30b21fbdc3fe4e576759683777c4ce.tar.gz
git-e1355547fd30b21fbdc3fe4e576759683777c4ce.tar.bz2
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>
Diffstat (limited to 'git-applymbox.sh')
-rwxr-xr-xgit-applymbox.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-applymbox.sh b/git-applymbox.sh
index 24d4a8c..c686cc8 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