diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2008-09-02 14:11:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-02 17:03:01 -0700 |
| commit | 6eb1b437933e075bd84c5cdcf5de95ed4db4820f (patch) | |
| tree | bfed09b9c818c1a65907c59b380bfc685030eabc /builtin-merge-recursive.c | |
| parent | 18668f5319b079cce29e19817bc352b1413e0908 (diff) | |
| download | git-6eb1b437933e075bd84c5cdcf5de95ed4db4820f.tar.gz | |
cherry-pick/revert: make direct internal call to merge_tree()
Refactored merge-recursive interface may still not be ideal but it already
allows us to make a direct call to merge_tree().
One regression is that the status message is lost as there is no way to
flush them from outside the refactored library code yet.
[jc: initial version by Miklos, with moderate amount of fixup by me]
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions