Merge branch 'maint'

diff --git a/merge-recursive.h b/merge-recursive.h
index 39de100cd5dcac1a643d1562abf5c8f73877dec1..be8410ad1803bc10e5dbf74f39eecdfed53469b1 100644 (file)
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -7,10 +7,11 @@ struct merge_options {
        const char *branch1;
        const char *branch2;
        enum {
-               MERGE_RECURSIVE_SUBTREE = 1,
+               MERGE_RECURSIVE_NORMAL = 0,
                MERGE_RECURSIVE_OURS,
                MERGE_RECURSIVE_THEIRS,
        } recursive_variant;
+       const char *subtree_shift;
        unsigned buffer_output : 1;
        int verbosity;
        int diff_rename_limit;
@@ -21,6 +22,9 @@ 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,