Re: [PATCH v4 4/4] mergetool: honor -O

David Aguilar writes: >> 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, I'll queue these four with Reviewed-by's from j6t. Thanks, both.

Re: [PATCH v4 4/4] mergetool: honor -O

On Mon, Oct 10, 2016 at 11:28:35AM -0700, Junio C Hamano wrote: > David Aguilar writes: > > > Teach mergetool to pass "-O" down to `git diff` when > > specified on the command-line. > > > > Helped-by: Johannes Sixt > > Signed-off-by: David Aguilar

Re: [PATCH v4 4/4] mergetool: honor -O

David Aguilar writes: > Teach mergetool to pass "-O" down to `git diff` when > specified on the command-line. > > Helped-by: Johannes Sixt > Signed-off-by: David Aguilar > --- > Since v3: > > I missed one last piped invocation of "git

Re: [PATCH v4 4/4] mergetool: honor -O

With this final fixup, the series looks good to me, and I have no further comments. Reviewed-by: Johannes Sixt -- Hannes

[PATCH v4 4/4] mergetool: honor -O

Teach mergetool to pass "-O" down to `git diff` when specified on the command-line. Helped-by: Johannes Sixt Signed-off-by: David Aguilar --- Since v3: I missed one last piped invocation of "git mergetool" in the tests, which has been fixed.