From: Elijah Newren <newren@gmail.com>
Date: Sat, 11 Nov 2017 16:49:15 GMT
Subject: Re: [RFC PATCH 3/9] merge-recursive: New function for better colliding conflict resolutions
Message-ID: <CABPp-BHhjUp3_UcO2u4sVzj0mbk_aVKWK=-KbBECLvwDhE3tvg@mail.gmail.com>
In-Reply-To: <20171110222156.23221-4-newren@gmail.com>

On Fri, Nov 10, 2017 at 2:21 PM, Elijah Newren <newren@gmail.com> wrote:
> There are three conflict types that represent two (possibly entirely
> unrelated) files colliding at the same location:
<snip>
> If the files are similar enough, the two-way merge is probably
> preferable, but if they're not similar, recording as separate files is
> probably similar.  (The same logic that applies for the working

That should read, "...recording as separate files is probably preferable".