summaryrefslogtreecommitdiff
path: root/mergetools/tortoisemerge
AgeCommit message (Expand)Author
2013-02-02mergetools: teach tortoisemerge to handle filenames with SP correctlySven Strickroth
2013-01-27mergetools: support TortoiseGitMergeSven Strickroth
2011-08-19mergetool--lib: Refactor tools into separate filesDavid Aguilar