aboutsummaryrefslogtreecommitdiff
path: root/mergetools/winmerge
Commit message (Expand)AuthorAge
* mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar2016-11-29
* mergetools: create mergetool_find_win32_cmd() helper function for winmergeJacob Nisnevich2016-04-04
* mergetools: add winmerge as a builtin toolDavid Aguilar2015-05-20