From: David Aguilar <davvid@gmail.com>
Date: Fri, 7 Oct 2016 23:58:05 +0000 (-0700)
Subject: mergetool: honor diff.orderFile
X-Git-Tag: v2.11.0-rc0~56^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/57937f70a09c12ef484c290865dac4066d207c9c?hp=57937f70a09c12ef484c290865dac4066d207c9c

mergetool: honor diff.orderFile

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>
---