t/t3415: use && where applicable.

[git.git] / merge-recursive.h

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