diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-02-05 16:40:44 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-05 16:40:44 -0800 |
| commit | b65b9ff1ff8a809246cc6bd8ad9051b28e5bf330 (patch) | |
| tree | 47b36b11a40a3a382fd76575b59dc415ee525924 /t/t4203-mailmap.sh | |
| parent | Merge branch 'so/log-diff-merge' (diff) | |
| parent | merge-ort: add handling for different types of files at same path (diff) | |
| download | tgif-b65b9ff1ff8a809246cc6bd8ad9051b28e5bf330.tar.xz | |
Merge branch 'en/ort-conflict-handling'
ORT merge strategy learns more support for merge conflicts.
* 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 't/t4203-mailmap.sh')
0 files changed, 0 insertions, 0 deletions