| commit | 57937f70a09c12ef484c290865dac4066d207c9c | |
| author | David Aguilar <davvid@gmail.com> | |
| Fri, 7 Oct 2016 23:58:05 +0000 (7 16:58 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 11 Oct 2016 17:04:27 +0000 (11 10:04 -0700) | ||
| tree | d44cb9e278c3e42c2f0fa3b446ff021e8512f722 | treesnapshot (tar.gz zip) |
| parent | 08221e3fa27396aca30cb539f006f78636782951 | commitdiff |
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>
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>
| Documentation/git-mergetool.txt | diffblobblamehistory | |
| git-mergetool.sh | diffblobblamehistory | |
| t/t7610-mergetool.sh | diffblobblamehistory |