Avoid conflicts when merging branches with mixed normalization

[thirdparty/git.git] / builtin / merge.c

diff --git a/builtin/merge.c b/builtin/merge.c
index 37ce4f589f6582abf0d1ef5bd263f590a16853d5..b836e9c68b3c10fcc2575041c35743967d77827a 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -503,6 +503,9 @@ static int git_merge_config(const char *k, const char *v, void *cb)
                return git_config_string(&pull_octopus, k, v);
        else if (!strcmp(k, "merge.log") || !strcmp(k, "merge.summary"))
                option_log = git_config_bool(k, v);
+       else if (!strcmp(k, "merge.renormalize")) {
+               merge_renormalize = git_config_bool(k, v);
+       }
        return git_diff_ui_config(k, v, cb);
 }