merge-recursive --renormalize

diff --git a/merge-recursive.c b/merge-recursive.c
index 23f7a4d139b4ed590113727cd196c7668085542f..762b5494d216b6a3cfe7e79847071e61d9669732 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1486,7 +1486,7 @@ void init_merge_options(struct merge_options *o)
        o->buffer_output = 1;
        o->diff_rename_limit = -1;
        o->merge_rename_limit = -1;
-       o->renormalize = merge_renormalize;
+       o->renormalize = 0;
        git_config(merge_recursive_config, o);
        if (getenv("GIT_MERGE_VERBOSITY"))
                o->verbosity =