Matthieu Moy 264b774ba6 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>

2009-11-29 23:52:31 -08:00

1.4 KiB

Raw Blame History

View Raw