David Aguilar 654311bf6e mergetool: honor -O<orderfile> ...

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>
Reviewed-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2016-10-11 10:04:31 -07:00

9.8 KiB

Executable File

Raw Blame History

View Raw