diff options
| author |  Elijah Newren <newren@gmail.com> | 2018-07-02 06:30:54 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-07-03 14:47:47 -0700 |
| commit | 651f7f3a1b15beec5319ea95b91a7461c805f37b (patch) | |
| tree | 2678d99b91c5cfe513992d0fb9e2a2b5e3291bfe /submodule.h | |
| parent | t6042: add testcase covering rename/rename(2to1)/delete/delete conflict (diff) | |
| download | tgif-651f7f3a1b15beec5319ea95b91a7461c805f37b.tar.xz | |
t6042: add testcase covering long chains of rename conflicts
Each rename is a lego: the source side could be connected to a delete or
another rename, and the destination side could be connected to a rename or a
conflicting add. Previous tests combined these to get e.g.
rename/rename(1to2)/add/add, rename/rename(2to1)/delete/delete, and
rename/add/delete. But we can also build bigger chains of conflicts. Add a
testcase demonstrating this.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'submodule.h')
0 files changed, 0 insertions, 0 deletions