Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | mergetool: honor mergetool.$tool.trustExitCode for built-in tools | David Aguilar | 2016-11-29 | 1 | -2/+0 |
* | mergetools: create mergetool_find_win32_cmd() helper function for winmerge | Jacob Nisnevich | 2016-04-04 | 1 | -20/+1 |
* | mergetools: add winmerge as a builtin tool | David Aguilar | 2015-05-20 | 1 | -0/+36 |