From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Oct 2016 18:28:35 GMT
Subject: Re: [PATCH v4 4/4] mergetool: honor -O<orderfile>
Message-ID: <xmqqa8ecf48c.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <20161008000130.22858-1-davvid@gmail.com>

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?