diff options
| author |  Elijah Newren <newren@gmail.com> | 2021-03-20 00:03:47 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-03-20 12:35:40 -0700 |
| commit | 3860220bfa594a56daa801aaedbdf8ac75b62bb6 (patch) | |
| tree | d241fa1cdb25c0d22e3f56b5b6ec4acae6efa20b /config.c | |
| parent | merge-ort: have ll_merge() use a special attr_index for renormalization (diff) | |
| download | tgif-3860220bfa594a56daa801aaedbdf8ac75b62bb6.tar.xz | |
merge-ort: let renormalization change modify/delete into clean delete
When we have a modify/delete conflict, but the only change to the
modification is e.g. change of line endings, then if renormalization is
requested then we should be able to recognize such a case as a
not-modified/delete and resolve the conflict automatically.
This fixes t6418.10 under GIT_TEST_MERGE_ALGORITHM=ort.
Signed-off-by: Elijah Newren <newren@gmail.com>
Reviewed-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'config.c')
0 files changed, 0 insertions, 0 deletions