summaryrefslogtreecommitdiff
path: root/mergetools/winmerge
Commit message (Expand)AuthorAgeFilesLines
* mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar2016-11-291-2/+0
* mergetools: create mergetool_find_win32_cmd() helper function for winmergeJacob Nisnevich2016-04-041-20/+1
* mergetools: add winmerge as a builtin toolDavid Aguilar2015-05-201-0/+36