X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=ll-merge.c;h=6bb3095c3a85d771bb60e8f2f025287d16e792df;hb=3f142468997f9d14d8051a96b2e9db265d41ac0d;hp=290f764f564bdb3e046aa388d655210f3c9cb9f8;hpb=73cf7f713da4fc797e2393a9e490ad4ec9466c53;p=git.git

diff --git a/ll-merge.c b/ll-merge.c
index 290f764f5..6bb3095c3 100644
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -99,8 +99,8 @@ static int ll_union_merge(const struct ll_merge_driver *drv_unused,
 			  int flag, int marker_size)
 {
 	/* Use union favor */
-	flag = (flag & LL_OPT_VIRTUAL_ANCESTOR) |
-	       create_ll_flag(XDL_MERGE_FAVOR_UNION);
+	flag &= ~LL_OPT_FAVOR_MASK;
+	flag |= create_ll_flag(XDL_MERGE_FAVOR_UNION);
 	return ll_xdl_merge(drv_unused, result, path_unused,
 			    orig, NULL, src1, NULL, src2, NULL,
 			    flag, marker_size);
@@ -345,7 +345,7 @@ int ll_merge(mmbuffer_t *result_buf,
 	const struct ll_merge_driver *driver;
 	int virtual_ancestor = flag & LL_OPT_VIRTUAL_ANCESTOR;
 
-	if (merge_renormalize) {
+	if (flag & LL_OPT_RENORMALIZE) {
 		normalize_file(ancestor, path);
 		normalize_file(ours, path);
 		normalize_file(theirs, path);