diff options
| author |  Elijah Newren <newren@gmail.com> | 2018-11-07 20:40:22 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-11-08 14:23:53 +0900 |
| commit | bb05c9f7595274bcfabf775ea51b4765c503b055 (patch) | |
| tree | 55961bc821036d927f3f2e6e91f57a92c0595d1f /refs | |
| parent | merge-recursive: avoid showing conflicts with merge branch before HEAD (diff) | |
| download | tgif-bb05c9f7595274bcfabf775ea51b4765c503b055.tar.xz | |
t6042: add tests for consistency in file collision conflict handling
Add testcases dealing with file collisions for the following types of
conflicts:
* add/add
* rename/add
* rename/rename(2to1)
All these conflict types simplify down to two files "colliding"
and should thus be handled similarly. This means that rename/add and
rename/rename(2to1) conflicts need to be modified to behave the same as
add/add conflicts currently do: the colliding files should be two-way
merged (instead of the current behavior of writing the two colliding
files out to separate temporary unique pathnames). Add testcases which
check this; subsequent commits will fix the conflict handling to make
these tests pass.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'refs')
0 files changed, 0 insertions, 0 deletions