From: David Aguilar <davvid@gmail.com>
Date: Tue, 11 Oct 2016 05:06:23 GMT
Subject: Re: [PATCH v4 4/4] mergetool: honor -O<orderfile>
Message-ID: <20161011050623.GA14278@gmail.com>
In-Reply-To: <xmqqa8ecf48c.fsf@gitster.mtv.corp.google.com>

On Mon, Oct 10, 2016 at 11:28:35AM -0700, Junio C Hamano wrote:
> David Aguilar <davvid@gmail.com> writes:
> 
> > Teach mergetool to pass "-O<orderfile>" down to `git diff` when
> > specified on the command-line.
> >
> > Helped-by: Johannes Sixt <j6t@kdbg.org>
> > Signed-off-by: David Aguilar <davvid@gmail.com>
> > ---
> > Since v3:
> >
> > I missed one last piped invocation of "git mergetool" in the tests,
> > which has been fixed.
> 
> I only see 4/4 in v4; am I correct to assume that 1-3/4 of v4 are
> the same as their counterparts in v3?

Yes, 1-3 are unchanged since v3.
Thanks for checking,
-- 
David