From dc1166e685dc54946ea4600e962e56a965962ec2 Mon Sep 17 00:00:00 2001 From: Matthieu Moy Date: Thu, 2 Sep 2010 13:57:33 +0200 Subject: Move set_porcelain_error_msgs to unpack-trees.c and rename it The function is currently dealing only with error messages, but the intent of calling it is really to notify the unpack-tree mechanics that it is running in porcelain mode. Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano --- merge-recursive.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'merge-recursive.h') diff --git a/merge-recursive.h b/merge-recursive.h index 08f9850367..f79917cef4 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -23,12 +23,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, -- cgit v1.2.3