X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-recursive.c;h=857f03dc6112ed5bce6b77b7da9535330ea29015;hb=HEAD;hp=6479a60cd112c5b06b354b1a251c60bb4bce972a;hpb=508d1244dc8d38188c70e98207efa8a97d16b47c;p=git.git

diff --git a/merge-recursive.c b/merge-recursive.c
index 6479a60cd..857f03dc6 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -2068,9 +2068,9 @@ int parse_merge_opt(struct merge_options *o, const char *s)
 	else if (!prefixcmp(s, "subtree="))
 		o->subtree_shift = s + strlen("subtree=");
 	else if (!strcmp(s, "patience"))
-		o->xdl_opts |= XDF_PATIENCE_DIFF;
+		o->xdl_opts = DIFF_WITH_ALG(o, PATIENCE_DIFF);
 	else if (!strcmp(s, "histogram"))
-		o->xdl_opts |= XDF_HISTOGRAM_DIFF;
+		o->xdl_opts = DIFF_WITH_ALG(o, HISTOGRAM_DIFF);
 	else if (!strcmp(s, "ignore-space-change"))
 		o->xdl_opts |= XDF_IGNORE_WHITESPACE_CHANGE;
 	else if (!strcmp(s, "ignore-all-space"))