X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-recursive.h;h=34492dbd6ea22d715c98acbeeabe04033ff9a794;hb=bc0f35ca238ff88829cd9839641a316e859348a2;hp=08f985036781f67eeda3fde1ae35f62f42f31096;hpb=613e4e5f4046ee36f40199cbaeb9f35442d24378;p=git.git

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