diff options
| author |  Elijah Newren <newren@gmail.com> | 2018-07-02 06:30:53 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-07-03 14:47:44 -0700 |
| commit | eee73388f25a7a0c61b2200868d93ff8d91b27ca (patch) | |
| tree | 0a5dff472eeef6587d086f82340013537d7c94de /Documentation/git-notes.txt | |
| parent | t6042: add testcase covering rename/add/delete conflict type (diff) | |
| download | tgif-eee73388f25a7a0c61b2200868d93ff8d91b27ca.tar.xz | |
t6042: add testcase covering rename/rename(2to1)/delete/delete conflict
If either side of a rename/rename(2to1) conflict is itself also involved
in a rename/delete conflict, then the conflict is a little more complex;
we can even have what I'd call a rename/rename(2to1)/delete/delete
conflict. (In some ways, this is similar to a rename/rename(1to2)/add/add
conflict, as added in commit 3672c9714830 ("merge-recursive: Fix working
copy handling for rename/rename/add/add", 2011-08-11)). Add a testcase
for such a conflict.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-notes.txt')
0 files changed, 0 insertions, 0 deletions