ll-merge: let caller decide whether to renormalize

diff --git a/merge-recursive.c b/merge-recursive.c
index c0c9f0ccc46a7e0c63d5445bcb6fa4927124dff2..23f7a4d139b4ed590113727cd196c7668085542f 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -648,6 +648,7 @@ static int merge_3way(struct merge_options *o,
        merge_status = ll_merge(result_buf, a->path, &orig, base_name,
                                &src1, name1, &src2, name2,
                                ((o->call_depth ? LL_OPT_VIRTUAL_ANCESTOR : 0) |
+                                (o->renormalize ? LL_OPT_RENORMALIZE : 0) |
                                 create_ll_flag(favor)));
 
        free(name1);