| commit | 5b4c45af0cb5cea7b26e2fb5464038f7663f5800 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 17 Oct 2016 20:25:21 +0000 (17 13:25 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 17 Oct 2016 20:25:21 +0000 (17 13:25 -0700) | ||
| tree | a432ea16fa1549f73151b6d1c7b39fef8caf1f4e | treesnapshot (tar.gz zip) |
| parent | 69e6544998892a2bd3c785cd238c786da40cf6a3 | commitdiff |
| parent | 654311bf6ee0fbf530c088271c2c76d46f31f82d | commitdiff |
Merge branch 'da/mergetool-diff-order'
"git mergetool" learned to honor "-O<orderfile>" to control the
order of paths to present to the end user.
* da/mergetool-diff-order:
mergetool: honor -O<orderfile>
mergetool: honor diff.orderFile
mergetool: move main program flow into a main() function
mergetool: add copyright
"git mergetool" learned to honor "-O<orderfile>" to control the
order of paths to present to the end user.
* da/mergetool-diff-order:
mergetool: honor -O<orderfile>
mergetool: honor diff.orderFile
mergetool: move main program flow into a main() function
mergetool: add copyright