aboutsummaryrefslogtreecommitdiff
path: root/mergetools/tortoisemerge
Commit message (Expand)AuthorAge
* mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar2016-11-29
* mergetools: teach tortoisemerge to handle filenames with SP correctlySven Strickroth2013-02-01
* mergetools: support TortoiseGitMergeSven Strickroth2013-01-26
* mergetool--lib: Refactor tools into separate filesDavid Aguilar2011-08-19