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	mergetools: simplify how we handle "vim" and "defaults"	2013-01-28 19:00:38 -08:00
gvimdiff2	mergetools: simplify how we handle "vim" and "defaults"	2013-01-28 19:00:38 -08:00
kdiff3	…
kompare	…
meld	…
opendiff	…
p4merge	mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder	2012-12-26 18:13:15 -08:00
tkdiff	…
tortoisemerge	mergetools: teach tortoisemerge to handle filenames with SP correctly	2013-02-01 18:06:03 -08:00
vimdiff	mergetools: simplify how we handle "vim" and "defaults"	2013-01-28 19:00:38 -08:00
vimdiff2	mergetools: simplify how we handle "vim" and "defaults"	2013-01-28 19:00:38 -08:00
xxdiff	…