summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorMatthieu Moy <Matthieu.Moy@imag.fr>2010-09-02 13:57:33 +0200
committerJunio C Hamano <gitster@pobox.com>2010-09-03 09:31:28 -0700
commitdc1166e685dc54946ea4600e962e56a965962ec2 (patch)
tree32c6807e0344a44b108fa3382278af0f41b51ea7 /merge-recursive.h
parente935e62a0fd26ff1f29a98a4ca8fa693f42357a2 (diff)
downloadgit-dc1166e685dc54946ea4600e962e56a965962ec2.tar.gz
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 <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
-rw-r--r--merge-recursive.h6
1 files changed, 0 insertions, 6 deletions
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,