mirror of
https://github.com/git/git.git
synced 2024-10-31 06:17:56 +01:00
eeaf4e7c32
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 |
||
---|---|---|
.. | ||
araxis | ||
bc3 | ||
codecompare | ||
deltawalker | ||
diffuse | ||
ecmerge | ||
emerge | ||
gvimdiff | ||
gvimdiff2 | ||
kdiff3 | ||
kompare | ||
meld | ||
opendiff | ||
p4merge | ||
tkdiff | ||
tortoisemerge | ||
vimdiff | ||
vimdiff2 | ||
xxdiff |