mirror of
https://github.com/git/git.git
synced 2024-10-29 21:37:53 +01:00
5ec11ab39d
The actual external command to run for mergetool backend can be specified with difftool/mergetool.$name.cmd configuration variables, but this mechanism was ignored for the backends we natively support. * da/mergetool-custom: mergetool--lib: Allow custom commands to override built-ins |
||
---|---|---|
.. | ||
araxis | ||
bc3 | ||
codecompare | ||
defaults | ||
deltawalker | ||
diffuse | ||
ecmerge | ||
emerge | ||
kdiff3 | ||
kompare | ||
meld | ||
opendiff | ||
p4merge | ||
tkdiff | ||
tortoisemerge | ||
vim | ||
xxdiff |