kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
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.
64288 Commits
6 Branches
36 Tags
131 MiB
 
 
 
 
 
 
Tree: f69a6e4f07
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'f69a6e4f07'
${ noResults }
git/mergetools
Michael Schindler 47eb4c6890
mergetools/kdiff3: make kdiff3 work on Windows too 		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 mergetools/kdiff3: make kdiff3 work on Windows too 4 years ago
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/vimdiff: add vimdiff1 merge tool variant 4 years ago
winmerge
…
xxdiff
…