зеркало из https://github.com/microsoft/git.git
d203add892
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 |
||
|---|---|---|
| .. | ||
| araxis | ||
| bc | ||
| codecompare | ||
| deltawalker | ||
| diffmerge | ||
| diffuse | ||
| ecmerge | ||
| emerge | ||
| examdiff | ||
| guiffy | ||
| gvimdiff | ||
| kdiff3 | ||
| kompare | ||
| meld | ||
| nvimdiff | ||
| opendiff | ||
| p4merge | ||
| smerge | ||
| tkdiff | ||
| tortoisemerge | ||
| vimdiff | ||
| winmerge | ||
| xxdiff | ||