projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0349080
)
applymbox: typofix to enable -m option.
author
Junio C Hamano
<junkio@cox.net>
Tue, 29 Nov 2005 22:14:42 +0000
(14:14 -0800)
committer
Junio C Hamano
<junkio@cox.net>
Tue, 29 Nov 2005 22:14:42 +0000
(14:14 -0800)
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>
git-applymbox.sh
patch
|
blob
|
history
diff --git
a/git-applymbox.sh
b/git-applymbox.sh
index
24d4a8c
..
c686cc8
100755
(executable)
--- 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