PATH : /lib/git-core/mergetools/
|
araxis |
|
|
bc |
|
|
bc3 |
|
|
codecompare |
|
|
deltawalker |
|
|
diffmerge |
|
|
diffuse |
|
|
ecmerge |
|
|
emerge |
|
|
examdiff |
|
|
guiffy |
|
|
gvimdiff |
|
|
gvimdiff2 |
|
|
gvimdiff3 |
|
|
kdiff3 |
|
|
kompare |
|
|
meld |
|
|
opendiff |
|
|
p4merge |
|
|
smerge |
|
|
tkdiff |
|
|
tortoisemerge |
|
|
vimdiff |
|
|
vimdiff2 |
|
|
vimdiff3 |
|
|
winmerge |
|
|
xxdiff |
|