X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-recursive.h;h=34492dbd6ea22d715c98acbeeabe04033ff9a794;hb=8fe5aeddcbeb194ea0f6e23e1f7b4ac38809921b;hp=b831293b3865ae52584565039e4a893c3c6f45ff;hpb=a7d7853463ae77fc3c8511283f5c896bee673b33;p=git.git

diff --git a/merge-recursive.h b/merge-recursive.h
index b831293b3..34492dbd6 100644
--- 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;
 };
 
-/* 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,