X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-applymbox.sh;h=c686cc8d27a64998c141cca2989375910601f90f;hb=830273d10cf1cfe646db39b87d3ccb49bf88b73a;hp=24d4a8cb4eb95a5201c205be879d3ac6a62a8a15;hpb=36d277c72d90d32f99616072b64a2652248f5264;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