From: Stefan Beller <sbeller@google.com>
Date: Wed, 18 Apr 2018 23:22:15 GMT
Subject: Re: [RFC WIP PATCH] merge: implement -s theirs -X N
Message-ID: <CAGZ79kak57D2_9bx5KwefFEZ0=Dk2bbZ=n8YFnByChK=6Hj2HQ@mail.gmail.com>
In-Reply-To: <87sh7sdtc1.fsf@evledraar.gmail.com>

On Wed, Apr 18, 2018 at 3:48 PM, Ævar Arnfjörð Bjarmason
<avarab@gmail.com> wrote:
> We have a -s ours, but not a -s theirs. This is a WIP patch to implement
> that. It works, but I haven't dealt with this part of the internal API
> before, comments most welcome.

I hope reference pointers are welcome, too.
https://public-inbox.org/git/xmqqzi9iazrp.fsf@gitster.mtv.corp.google.com/