summaryrefslogtreecommitdiff
path: root/mergetools/tortoisemerge
Commit message (Expand)AuthorAgeFilesLines
* mergetools: add description to all diff/merge toolsFernando Ramos2022-04-031-0/+8
* mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar2016-11-291-2/+0
* mergetools: teach tortoisemerge to handle filenames with SP correctlySven Strickroth2013-02-011-3/+11
* mergetools: support TortoiseGitMergeSven Strickroth2013-01-261-1/+10
* mergetool--lib: Refactor tools into separate filesDavid Aguilar2011-08-191-0/+17