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 4aff18a3f0 Merge branch 'ls/mergetool-meld-auto-merge' 4 years ago
..
araxis
bc mergetool--lib: improve support for vimdiff-style tool variants 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 4 years ago
opendiff
p4merge
smerge
tkdiff
tortoisemerge
vimdiff mergetools: add support for nvimdiff (neovim) family 4 years ago
winmerge
xxdiff