diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2009-11-29 12:18:32 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-30 07:52:31 (GMT) |
| commit | 264b774ba6b27cc07ef4c33d52e491d9abf029bb (patch) | |
| tree | 49d67bd2fd3d6167733c85f3449c97684e64b13f /merge-recursive.h | |
| parent | 78d553b7d7b269bb22ebd8b1198657c37484a3a0 (diff) | |
| download | git-264b774ba6b27cc07ef4c33d52e491d9abf029bb.zip git-264b774ba6b27cc07ef4c33d52e491d9abf029bb.tar.gz git-264b774ba6b27cc07ef4c33d52e491d9abf029bb.tar.bz2 | |
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 <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
| -rw-r--r-- | merge-recursive.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/merge-recursive.h b/merge-recursive.h index fd138ca..d8bc729 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, |