mergetool: honor diff.orderFile
authorDavid Aguilar <davvid@gmail.com>
Fri, 7 Oct 2016 23:58:05 +0000 (16:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Oct 2016 17:04:27 +0000 (10:04 -0700)
Teach mergetool to get the list of files to edit via `diff` so that we
gain support for diff.orderFile.

Suggested-by: Luis Gutierrez <luisgutz@gmail.com>
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>
No differences found