X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-recursive.h;h=196f0531062a095d57afc92c16c57a67ec93f31c;hb=f92d62ec4ead67109418483b65aaf158b7462121;hp=08f985036781f67eeda3fde1ae35f62f42f31096;hpb=eec0daf6fd5a31cda601caeaa3a0bfebf2d17fe8;p=git.git

diff --git a/merge-recursive.h b/merge-recursive.h
index 08f985036..196f05310 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -14,6 +14,7 @@ struct merge_options {
 	} recursive_variant;
 	const char *subtree_shift;
 	unsigned buffer_output : 1;
+	unsigned renormalize : 1;
 	int verbosity;
 	int diff_rename_limit;
 	int merge_rename_limit;