fast-import: tighten M 040000 syntax

diff --git a/merge-recursive.h b/merge-recursive.h
index 0cc465ec5d13385dd8ecdbd64387cf937c82bce3..34492dbd6ea22d715c98acbeeabe04033ff9a794 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;
@@ -23,9 +24,6 @@ struct merge_options {
        struct string_list current_directory_set;
 };
 
-/* Return a list of user-friendly error messages to be used by merge */
-struct unpack_trees_error_msgs get_porcelain_error_msgs(void);
-
 /* merge_trees() but with recursive ancestor consolidation */
 int merge_recursive(struct merge_options *o,
                    struct commit *h1,