On Fri, Nov 10, 2017 at 2:21 PM, Elijah Newren <newren@xxxxxxxxx> wrote: > Adds testcases dealing with file collisions for the following types of > conflicts: > * add/add > * rename/add > * rename/rename(2to1) <snip> > --- > t/t6036-recursive-corner-cases.sh | 8 +- The changes to t6036 were supposed to have been squashed into a later commit in this series; I apparently flubbed it and squashed it into the wrong commit. Will fix together with whatever other feedback I get on the series before re-posting. > t/t6042-merge-rename-corner-cases.sh | 210 +++++++++++++++++++++++++++++++++++ > 2 files changed, 214 insertions(+), 4 deletions(-)
