diff options
| author |  Elijah Newren <newren@gmail.com> | 2021-01-01 02:34:43 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-01-04 10:40:45 -0800 |
| commit | 62fdec17a111e419b750938d24b6d65e3076b76d (patch) | |
| tree | 1d7b504f8540a3927e1bca23e99a42eb362c9b4a /t/t5404-tracking-branches.sh | |
| parent | merge-ort: handle book-keeping around two- and three-way content merge (diff) | |
| download | tgif-62fdec17a111e419b750938d24b6d65e3076b76d.tar.xz | |
merge-ort: flesh out implementation of handle_content_merge()
This implementation is based heavily on merge_mode_and_contents() from
merge-recursive.c, though it has some fixes for recursive merges (i.e.
when call_depth > 0), and has a number of changes throughout based on
slight differences in data structures and in how the functions are
called.
It is, however, based on two new helper functions -- merge_3way() and
merge_submodule -- for which we only provide die-not-implemented stubs
at this point. Future commits will add implementations of these
functions.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5404-tracking-branches.sh')
0 files changed, 0 insertions, 0 deletions