On Tue, Nov 14, 2017 at 10:48 AM, Stefan Beller <sbeller@xxxxxxxxxx> wrote: > test_expect_success 'unrelated file/submodule conflict is ignored' ' > ( > cd a_repo && > git checkout with_file^0 && > git cherry-pick with_sub^0 This makes no sense, yet. Sorry about the noise. I think your patch is fine as is.
