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>
Junio C Hamano committed
Nov 29, 2005 at 14:14 UTC
e1355547fd30b21fbdc3fe4e576759683777c4ce
1 file changed
+1
-1
git-applymbox.sh
+1
-1
@@ -33,7 +33,7 @@ do
33
-k) keep_subject=-k ;;
34
-q) query_apply=t ;;
35
-c) continue="$2"; resume=f; shift ;;
36
- -m) fallback_3way=t ;;
36
+ -m) fall_back_3way=t ;;
37
-*) usage ;;
38
*) break ;;
39
esac