| commit | 264b774ba6b27cc07ef4c33d52e491d9abf029bb | |
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | |
| Sun, 29 Nov 2009 12:18:32 +0000 (29 13:18 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 30 Nov 2009 07:52:31 +0000 (29 23:52 -0800) | ||
| tree | 49d67bd2fd3d6167733c85f3449c97684e64b13f | treesnapshot (tar.gz zip) |
| parent | 78d553b7d7b269bb22ebd8b1198657c37484a3a0 | commitdiff |
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>
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>
| merge-recursive.c | diffblobblamehistory | |
| merge-recursive.h | diffblobblamehistory |