| commit | 6eb1b437933e075bd84c5cdcf5de95ed4db4820f | |
| author | Miklos Vajna <vmiklos@frugalware.org> | |
| Tue, 2 Sep 2008 21:11:15 +0000 (2 14:11 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 3 Sep 2008 00:03:01 +0000 (2 17:03 -0700) | ||
| tree | bfed09b9c818c1a65907c59b380bfc685030eabc | treesnapshot (tar.gz zip) |
| parent | 18668f5319b079cce29e19817bc352b1413e0908 | commitdiff |
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>
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>
| builtin-revert.c | diffblobblamehistory |