From 264b774ba6b27cc07ef4c33d52e491d9abf029bb Mon Sep 17 00:00:00 2001 From: Matthieu Moy Date: Sun, 29 Nov 2009 13:18:32 +0100 Subject: merge-recursive: make the error-message generation an extern function The construction of the struct unpack_trees_error_msgs was done within git_merge_trees(), which prevented using the same messages easily from another function. [jc: backported for 1.6.5 maint before advice_commit_before_merge] Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano --- merge-recursive.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'merge-recursive.h') diff --git a/merge-recursive.h b/merge-recursive.h index fd138ca140..d8bc7299ee 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -17,6 +17,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, -- cgit v1.2.3