Merge branch 'jn/merge-renormalize'

[git.git] / merge-recursive.h

diff --git a/merge-recursive.h b/merge-recursive.h
index 08f985036781f67eeda3fde1ae35f62f42f31096..196f0531062a095d57afc92c16c57a67ec93f31c 100644 (file)
--- 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;