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 d203add892 Merge branch 'pd/mergetool-nvimdiff' 4 years ago
..
araxis
bc mergetools/bc: add `bc4` to the alias list for Beyond Compare 4 years ago
codecompare
deltawalker
diffmerge
diffuse
ecmerge
emerge
examdiff
guiffy
gvimdiff
kdiff3
kompare
meld mergetool: allow auto-merge for meld to follow the vim-diff behavior 4 years ago
nvimdiff mergetools: add support for nvimdiff (neovim) family 5 years ago
opendiff
p4merge
smerge mergetools: add support for smerge (Sublime Merge) 6 years ago
tkdiff
tortoisemerge
vimdiff mergetools: add support for nvimdiff (neovim) family 5 years ago
winmerge
xxdiff