From: Elijah Newren Date: Sat, 07 Jul 2018 20:44:01 GMT Subject: [PATCH 0/3] Add testcases showing suboptimal submodule/path conflict handling Message-ID: <20180707204404.7208-1-newren@gmail.com> Last November, Stefan asked me about an issue with submodules. In addition to providing a fix for that issue, I mentioned a few other problems I noticed with submodules and merging[1]. Turn those issues into testcases (as I probably should have done back then). [1] https://public-inbox.org/git/CABPp-BHDrw_dAESic3xK7kC3jMgKeNQuPQF69OpbVYhRkbhJsw@mail.gmail.com/ Elijah Newren (3): t7405: add a file/submodule conflict t7405: add a directory/submodule conflict t7405: verify 'merge --abort' works after submodule/path conflicts t/t7405-submodule-merge.sh | 173 +++++++++++++++++++++++++++++++++++++ 1 file changed, 173 insertions(+) -- 2.18.0.134.gafc206209.dirty