summaryrefslogtreecommitdiff
path: root/mergetools/tortoisemerge
AgeCommit message (Expand)AuthorFilesLines
2016-11-29mergetool: honor mergetool.$tool.trustExitCode for built-in toolsLibravatar David Aguilar1-2/+0
2013-02-01mergetools: teach tortoisemerge to handle filenames with SP correctlyLibravatar Sven Strickroth1-3/+11
2013-01-26mergetools: support TortoiseGitMergeLibravatar Sven Strickroth1-1/+10
2011-08-19mergetool--lib: Refactor tools into separate filesLibravatar David Aguilar1-0/+17