diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-01-14 12:41:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-01-14 12:41:54 -0800 |
| commit | 12aa5552a998c57cca471f82002d9f4ec03f5b83 (patch) | |
| tree | abbbed61ce4f113f6b898bbf0e9ede476067e7c1 /Documentation/RelNotes/1.6.5.4.txt | |
| parent | Merge branch 'en/diffcore-rename' into en/merge-ort-perf (diff) | |
| parent | merge-ort: add handling for different types of files at same path (diff) | |
| download | tgif-12aa5552a998c57cca471f82002d9f4ec03f5b83.tar.xz | |
Merge branch 'en/ort-conflict-handling' into en/merge-ort-perf
* en/ort-conflict-handling:
merge-ort: add handling for different types of files at same path
merge-ort: copy find_first_merges() implementation from merge-recursive.c
merge-ort: implement format_commit()
merge-ort: copy and adapt merge_submodule() from merge-recursive.c
merge-ort: copy and adapt merge_3way() from merge-recursive.c
merge-ort: flesh out implementation of handle_content_merge()
merge-ort: handle book-keeping around two- and three-way content merge
merge-ort: implement unique_path() helper
merge-ort: handle directory/file conflicts that remain
merge-ort: handle D/F conflict where directory disappears due to merge
Diffstat (limited to 'Documentation/RelNotes/1.6.5.4.txt')
0 files changed, 0 insertions, 0 deletions