Skip to content

Commit

Permalink
applymbox: typofix to enable -m option.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Nov 29, 2005
1 parent 0349080 commit e135554
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion git-applymbox.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e135554

Please sign in to comment.