diff options
| author |  Elijah Newren <newren@gmail.com> | 2020-10-26 17:01:40 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-10-26 12:31:24 -0700 |
| commit | c12d1f2ac227cbec44be27de83ef07d135f243c2 (patch) | |
| tree | c9edc8e3ac3b9e0d11ff3132a9a9438be8ba7bc1 /userdiff.h | |
| parent | t6404, t6423: expect improved rename/delete handling in ort backend (diff) | |
| download | tgif-c12d1f2ac227cbec44be27de83ef07d135f243c2.tar.xz | |
t6423: expect improved conflict markers labels in the ort backend
Conflict markers carry an extra annotation of the form
REF-OR-COMMIT:FILENAME
to help distinguish where the content is coming from, with the :FILENAME
piece being left off if it is the same for both sides of history (thus
only renames with content conflicts carry that part of the annotation).
However, there were cases where the :FILENAME annotation was
accidentally left off, due to merge-recursive's
every-codepath-needs-a-copy-of-all-special-case-code format.
Update a few tests to have the correct :FILENAME extension on relevant
paths with the ort backend, while leaving the expectation for
merge-recursive the same to avoid destabilizing it.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'userdiff.h')
0 files changed, 0 insertions, 0 deletions