diff options
| author |  Elijah Newren <newren@gmail.com> | 2021-01-01 02:34:45 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-01-04 10:40:45 -0800 |
| commit | c73cda76b104795d1455ecbf031a18045ab37a84 (patch) | |
| tree | bc472f3808d3c1cf3edfc4f8ba4987e672a9fce2 /Documentation/RelNotes/1.9.2.txt | |
| parent | merge-ort: copy and adapt merge_3way() from merge-recursive.c (diff) | |
| download | tgif-c73cda76b104795d1455ecbf031a18045ab37a84.tar.xz | |
merge-ort: copy and adapt merge_submodule() from merge-recursive.c
Take merge_submodule() from merge-recursive.c and make slight
adjustments, predominantly around deferring output using path_msg()
instead of using merge-recursive's output() and show() functions.
There's also a fix for recursive cases (when call_depth > 0) and a
slight change to argument order for find_first_merges().
find_first_merges() and format_commit() are left unimplemented for
now, but will be added by subsequent commits.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/RelNotes/1.9.2.txt')
0 files changed, 0 insertions, 0 deletions