You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 
Junio C Hamano eeaf4e7c32 Merge branch 'ss/mergetools-tortoise' 12 years ago
..
araxis
bc3
codecompare
deltawalker
diffuse
ecmerge
emerge
gvimdiff mergetools: simplify how we handle "vim" and "defaults" 12 years ago
gvimdiff2 mergetools: simplify how we handle "vim" and "defaults" 12 years ago
kdiff3
kompare
meld
opendiff
p4merge mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder 12 years ago
tkdiff
tortoisemerge mergetools: teach tortoisemerge to handle filenames with SP correctly 12 years ago
vimdiff mergetools: simplify how we handle "vim" and "defaults" 12 years ago
vimdiff2 mergetools: simplify how we handle "vim" and "defaults" 12 years ago
xxdiff