diff options
| author |  Matthieu Moy <Matthieu.Moy@imag.fr> | 2009-11-29 13:18:32 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-11-29 23:52:31 -0800 |
| commit | 264b774ba6b27cc07ef4c33d52e491d9abf029bb (patch) | |
| tree | 49d67bd2fd3d6167733c85f3449c97684e64b13f /t/t4129-apply-samemode.sh | |
| parent | GIT 1.6.5 (diff) | |
| download | tgif-264b774ba6b27cc07ef4c33d52e491d9abf029bb.tar.xz | |
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 't/t4129-apply-samemode.sh')
0 files changed, 0 insertions, 0 deletions