2 Commits (2b713c272cd8f9dc70ad746e8ba01a93d8baa023)

Author SHA1 Message Date
David Aguilar 7c10605d2c mergetool: honor mergetool.$tool.trustExitCode for built-in tools 8 years ago
Jacob Nisnevich 35d62bbe3e mergetools: add support for ExamDiff 9 years ago