X-Git-Url: http://git.tremily.us/?p=git.git;a=blobdiff_plain;f=merge-recursive.c;h=ea9dbd307c60a16f290b44964c386e566b6bc7e3;hp=33ba5dc07c86a81f0989927b9a6167833815533f;hb=HEAD;hpb=427c6d0caf0caee5ad2c4925910a6b8ebcf95408

diff --git a/merge-recursive.c b/merge-recursive.c
index 33ba5dc07..ea9dbd307 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -2068,6 +2068,15 @@ int parse_merge_opt(struct merge_options *o, const char *s)
 		o->xdl_opts = DIFF_WITH_ALG(o, PATIENCE_DIFF);
 	else if (!strcmp(s, "histogram"))
 		o->xdl_opts = DIFF_WITH_ALG(o, HISTOGRAM_DIFF);
+	else if (!strcmp(s, "diff-algorithm=")) {
+		long value = parse_algorithm_value(s+15);
+		if (value < 0)
+			return -1;
+		/* clear out previous settings */
+		DIFF_XDL_CLR(o, NEED_MINIMAL);
+		o->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK;
+		o->xdl_opts |= value;
+	}
 	else if (!strcmp(s, "ignore-space-change"))
 		o->xdl_opts |= XDF_IGNORE_WHITESPACE_CHANGE;
 	else if (!strcmp(s, "ignore-all-space"))