Junio C Hamano d203add892 Merge branch 'pd/mergetool-nvimdiff' ...

Fix regression introduced when nvimdiff support in mergetool was added.

* pd/mergetool-nvimdiff:
  mergetool: avoid letting `list_tool_variants` break user-defined setups
  mergetools/bc: add `bc4` to the alias list for Beyond Compare

2020-11-21 15:14:39 -08:00

..

araxis

…

bc

mergetools/bc: add bc4 to the alias list for Beyond Compare

2020-11-11 13:00:10 -08:00

codecompare

…

deltawalker

…

diffmerge

…

diffuse

…

ecmerge

…

emerge

…

examdiff

…

guiffy

mergetools: add support for guiffy

2018-04-06 08:11:39 +09:00

gvimdiff

…

kdiff3

…

kompare

…

meld

mergetool: allow auto-merge for meld to follow the vim-diff behavior

2020-09-16 17:11:20 -07:00

nvimdiff

mergetools: add support for nvimdiff (neovim) family

2020-07-29 14:44:49 -07:00

opendiff

…

p4merge

…

smerge

mergetools: add support for smerge (Sublime Merge)

2019-04-04 18:21:25 +09:00

tkdiff

…

tortoisemerge

…

vimdiff

mergetools: add support for nvimdiff (neovim) family

2020-07-29 14:44:49 -07:00

winmerge

…

xxdiff

…