diff options
| author |  Elijah Newren <newren@gmail.com> | 2021-01-01 02:34:42 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-01-04 10:40:45 -0800 |
| commit | 991bbdcab94d93c2a325c4ce74cff139f0f49d97 (patch) | |
| tree | ac589c0b18e48c4b8453f5cb37fad9c668100949 /Documentation/RelNotes/1.5.0.2.txt | |
| parent | merge-ort: implement unique_path() helper (diff) | |
| download | tgif-991bbdcab94d93c2a325c4ce74cff139f0f49d97.tar.xz | |
merge-ort: handle book-keeping around two- and three-way content merge
In addition to the content merge (which will go in a subsequent commit),
we need to worry about conflict messages, placing results in higher
order stages in case of a df_conflict, and making sure the results are
placed in ci->merged.result so that they will show up in the working
tree. Take care of all that external book-keeping, moving the
simplistic just-take-HEAD code into the barebones handle_content_merge()
function for now. Subsequent commits will flesh out
handle_content_merge().
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/RelNotes/1.5.0.2.txt')
0 files changed, 0 insertions, 0 deletions