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 b387c77b12 Sync with v1.8.2.3 12 years ago
..
araxis
bc3 mergetools: use the correct tool for Beyond Compare 3 on Windows 13 years ago
codecompare Add Code Compare v2.80.4 as a merge / diff tool for Windows 13 years ago
deltawalker mergetools: add a plug-in to support DeltaWalker 13 years ago
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 mergetools/kdiff3: do not use --auto when diffing 12 years ago
kompare
meld mergetools/meld: Use --help output to detect --output support 13 years ago
opendiff
p4merge mergetools/p4merge: create a base if none available 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