X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin%2Fmerge.c;h=b836e9c68b3c10fcc2575041c35743967d77827a;hb=672d1b789bc041be6aa18dcce066e6b556d6b787;hp=37ce4f589f6582abf0d1ef5bd263f590a16853d5;hpb=2ad6b143536273335be6e21f1500513911ea7315;p=git.git

diff --git a/builtin/merge.c b/builtin/merge.c
index 37ce4f589..b836e9c68 100644
--- 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);
 }