merge-trees: let caller decide whether to renormalize

diff --git a/merge-recursive.h b/merge-recursive.h
index 0cc465ec5d13385dd8ecdbd64387cf937c82bce3..c5fbe796bb799d02d115420d16657788acc1f0d8 100644 (file)
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -10,10 +10,11 @@ struct merge_options {
        enum {
                MERGE_RECURSIVE_NORMAL = 0,
                MERGE_RECURSIVE_OURS,
-               MERGE_RECURSIVE_THEIRS,
+               MERGE_RECURSIVE_THEIRS
        } recursive_variant;
        const char *subtree_shift;
        unsigned buffer_output : 1;
+       unsigned renormalize : 1;
        int verbosity;
        int diff_rename_limit;
        int merge_rename_limit;