mergetool: honor -O<orderfile>
Teach mergetool to pass "-O<orderfile>" down to `git diff` when specified on the command-line. Helped-by: NJohannes Sixt <j6t@kdbg.org> Signed-off-by: NDavid Aguilar <davvid@gmail.com> Reviewed-by: NJohannes Sixt <j6t@kdbg.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
Showing
想要评论请 注册 或 登录