add support for the SUA layer (interix; windows)

[git.git] / merge-recursive.h

diff --git a/merge-recursive.h b/merge-recursive.h
index d21b446a1df8add6f2824c77a8896b9098d5c0fa..c8135b0ec70cc2eb92e5a6fd9353a134fda6b7bf 100644 (file)
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -19,15 +19,13 @@ struct merge_options {
        int verbosity;
        int diff_rename_limit;
        int merge_rename_limit;
+       int rename_score;
        int call_depth;
        struct strbuf obuf;
        struct string_list current_file_set;
        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,