subject:"\[PATCH 3\/4\] mergetool\: honor diff.orderFile"

Re: [PATCH 3/4] mergetool: honor diff.orderFile

2016-10-07 Thread Johannes Sixt

Am 07.10.2016 um 01:47 schrieb David Aguilar: @@ -606,4 +606,37 @@ test_expect_success MKTEMP 'temporary filenames are used with mergetool.writeToT git reset --hard master >/dev/null 2>&1 ' +test_expect_success 'diff.orderFile configuration is honored' ' + test_config

[PATCH 3/4] mergetool: honor diff.orderFile

2016-10-06 Thread David Aguilar

Teach mergetool to get the list of files to edit via `diff` so that we gain support for diff.orderFile. Suggested-by: Luis Gutierrez Helped-by: Johannes Sixt Signed-off-by: David Aguilar --- Documentation/git-mergetool.txt | 5 +