summaryrefslogtreecommitdiff
path: root/mergetools/winmerge
AgeCommit message (Expand)AuthorFilesLines
2016-11-29mergetool: honor mergetool.$tool.trustExitCode for built-in toolsLibravatar David Aguilar1-2/+0
2016-04-04mergetools: create mergetool_find_win32_cmd() helper function for winmergeLibravatar Jacob Nisnevich1-20/+1
2015-05-20mergetools: add winmerge as a builtin toolLibravatar David Aguilar1-0/+36