From: Stefan Beller <sbeller@google.com>
Date: Tue, 14 Nov 2017 20:51:38 GMT
Subject: Re: [PATCH] merge-recursive: Handle addition of submodule on our side of history
Message-ID: <CAGZ79kZApzOsjns+q7mU=ta7OPd1fF7r8dWKY3GKa4sRTSMZ+w@mail.gmail.com>
In-Reply-To: <CAGZ79kbdC8fYx503=YKBvEE62=T5WYST0QSNuQjPp5QG1cx1aw@mail.gmail.com>

On Tue, Nov 14, 2017 at 10:48 AM, Stefan Beller <sbeller@google.com> 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.