Age | Commit message (Expand) | Author |
---|---|---|
2016-11-29 | mergetool: honor mergetool.$tool.trustExitCode for built-in tools | David Aguilar |
2013-02-02 | mergetools: teach tortoisemerge to handle filenames with SP correctly | Sven Strickroth |
2013-01-27 | mergetools: support TortoiseGitMerge | Sven Strickroth |
2011-08-19 | mergetool--lib: Refactor tools into separate files | David Aguilar |