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.
 
 
 
 
 
 
Jeff King 33d3c6bb9b Merge branch 'da/mergetools-p4' 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 12 years ago
defaults mergetool--lib: Allow custom commands to override built-ins 12 years ago
deltawalker mergetools: add a plug-in to support DeltaWalker 13 years ago
diffuse
ecmerge
emerge
kdiff3
kompare
meld mergetools/meld: Use --help output to detect --output support 13 years ago
opendiff
p4merge mergetools/p4merge: Handle "/dev/null" 12 years ago
tkdiff
tortoisemerge
vim
xxdiff