David Aguilar <davvid@xxxxxxxxx> writes: > Teach mergetool to pass "-O<orderfile>" down to `git diff` when > specified on the command-line. > > Helped-by: Johannes Sixt <j6t@xxxxxxxx> > Signed-off-by: David Aguilar <davvid@xxxxxxxxx> > --- > 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?