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 6c95f535e9 Merge branch 'da/mergetools-p4' into maint 12 years ago
..
araxis
bc3
codecompare Add Code Compare v2.80.4 as a merge / diff tool for Windows 13 years ago
defaults mergetool--lib: Allow custom commands to override built-ins 13 years ago
deltawalker mergetools: add a plug-in to support DeltaWalker 13 years ago
diffuse
ecmerge
emerge
kdiff3
kompare
meld
opendiff
p4merge mergetools/p4merge: Handle "/dev/null" 13 years ago
tkdiff
tortoisemerge
vim
xxdiff