mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
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>
This commit is contained in:
parent
034908047d
commit
e1355547fd
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue