summaryrefslogtreecommitdiff
path: root/mergetools/winmerge
AgeCommit message (Expand)Author
2016-11-29mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar
2016-04-04mergetools: create mergetool_find_win32_cmd() helper function for winmergeJacob Nisnevich
2015-05-20mergetools: add winmerge as a builtin toolDavid Aguilar