X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-recursive.c;h=0cc1e6fc1498e9fc51c9e382aee6a20e439a4ef0;hb=957450054cfbbe0d4ae8d33f7b74eace6e290f16;hp=db9ba19ddf94fec3a5cfff450b35f5bb7b46c35e;hpb=4ed54610e5ca8fdc34dcf8729f6416599d1bc39e;p=git.git

diff --git a/merge-recursive.c b/merge-recursive.c
index db9ba19dd..0cc1e6fc1 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1759,6 +1759,8 @@ int parse_merge_opt(struct merge_options *o, const char *s)
 		o->subtree_shift = s + strlen("subtree=");
 	else if (!strcmp(s, "patience"))
 		o->xdl_opts |= XDF_PATIENCE_DIFF;
+	else if (!strcmp(s, "histogram"))
+		o->xdl_opts |= XDF_HISTOGRAM_DIFF;
 	else if (!strcmp(s, "ignore-space-change"))
 		o->xdl_opts |= XDF_IGNORE_WHITESPACE_CHANGE;
 	else if (!strcmp(s, "ignore-all-space"))