X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-applymbox.sh;h=c686cc8d27a64998c141cca2989375910601f90f;hb=61f693bd5a2ab4d830aad6fce0a1c70863f38009;hp=24d4a8cb4eb95a5201c205be879d3ac6a62a8a15;hpb=ae2b0f15180d4b044828c836bcab6a990efa5c8e;p=git.git

diff --git a/git-applymbox.sh b/git-applymbox.sh
index 24d4a8cb..c686cc8d 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