Junio C Hamano eeaf4e7c32 Merge branch 'ss/mergetools-tortoise' ...

Update mergetools to work better with newer merge helper tortoise ships.

* ss/mergetools-tortoise:
  mergetools: teach tortoisemerge to handle filenames with SP correctly
  mergetools: support TortoiseGitMerge

2013-02-07 14:42:01 -08:00

..

araxis

…

bc3

…

codecompare

…

deltawalker

…

diffuse

…

ecmerge

…

emerge

…

gvimdiff

…

gvimdiff2

…

kdiff3

…

kompare

…

meld

…

opendiff

…

p4merge

…

tkdiff

…

tortoisemerge

…

vimdiff

…

vimdiff2

…

xxdiff

…