diff options
| author |  Elijah Newren <newren@gmail.com> | 2018-11-07 20:40:23 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-11-08 14:23:53 +0900 |
| commit | b28eeb3092fd12e24485fbadebfa57df457dd09a (patch) | |
| tree | fed958f7a72e0c7d74d5a5df7109d8c030a686ad /t/t5100/empty | |
| parent | t6042: add tests for consistency in file collision conflict handling (diff) | |
| download | tgif-b28eeb3092fd12e24485fbadebfa57df457dd09a.tar.xz | |
t6036, t6042: testcases for rename collision of already conflicting files
When a single file is renamed, it can also be modified, yielding the
possibility of that renamed file having content conflicts. If two
different such files are renamed into the same location, then two-way
merging those files may result in nested conflicts. Add a testcase that
makes sure we get this case correct, and uses different lengths of
conflict markers to differentiate between the different nestings.
Also add another case with an extra (i.e. third) level of conflict
markers due to using merge.conflictstyle=diff3 and the virtual merge
base also having conflicts present.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5100/empty')
0 files changed, 0 insertions, 0 deletions