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.
43122 Commits
6 Branches
36 Tags
131 MiB
 
 
 
 
 
 
Tree: c9e6ce41da
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'c9e6ce41da'
${ noResults }
git/mergetools
Jacob Nisnevich 35d62bbe3e
mergetools: add support for ExamDiff 		9 years ago
..
araxis
…
bc mergetool: rename bc3 to bc 10 years ago
bc3 mergetool: rename bc3 to bc 10 years ago
codecompare
…
deltawalker
…
diffmerge mergetools: stop setting $status in merge_cmd() 10 years ago
diffuse
…
ecmerge
…
emerge mergetools: stop setting $status in merge_cmd() 10 years ago
examdiff mergetools: add support for ExamDiff 9 years ago
gvimdiff
…
gvimdiff2
…
gvimdiff3 mergetools: add vimdiff3 mode 11 years ago
kdiff3 mergetools: stop setting $status in merge_cmd() 10 years ago
kompare
…
meld mergetools/meld: make usage of `--output` configurable and more robust 10 years ago
opendiff
…
p4merge
…
tkdiff
…
tortoisemerge
…
vimdiff mergetool: reorder vim/gvim buffers in three-way diffs 9 years ago
vimdiff2
…
vimdiff3 mergetools: add vimdiff3 mode 11 years ago
winmerge mergetools: create mergetool_find_win32_cmd() helper function for winmerge 9 years ago
xxdiff
…