3 Commits (0df670bc0b8b5499859829ba0889ce96a75304a6)

Author SHA1 Message Date
David Aguilar 7c10605d2c mergetool: honor mergetool.$tool.trustExitCode for built-in tools 8 years ago
Jacob Nisnevich e36d716751 mergetools: create mergetool_find_win32_cmd() helper function for winmerge 9 years ago
David Aguilar 3e4f2373b2 mergetools: add winmerge as a builtin tool 10 years ago