kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
61594 Commits
6 Branches
36 Tags
131 MiB
 
 
 
 
 
 
Tree: 94f6e3e283
git/mergetools
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 5 years ago
nvimdiff mergetools: add support for nvimdiff (neovim) family 5 years ago
opendiff
…
p4merge
…
smerge
…
tkdiff
…
tortoisemerge
…
vimdiff mergetools: add support for nvimdiff (neovim) family 5 years ago
winmerge
…
xxdiff
…