1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-15 21:53:44 +01:00
git/mergetools
Junio C Hamano c1777a2970 Merge branch 'oc/mergetools-beyondcompare'
* oc/mergetools-beyondcompare:
  mergetool: rename bc3 to bc
2014-10-29 10:08:04 -07:00
..
araxis
bc mergetool: rename bc3 to bc 2014-10-21 11:25:30 -07:00
bc3 mergetool: rename bc3 to bc 2014-10-21 11:25:30 -07:00
codecompare
deltawalker
diffmerge
diffuse
ecmerge
emerge
gvimdiff
gvimdiff2
gvimdiff3
kdiff3
kompare
meld mergetools/meld: make usage of --output configurable and more robust 2014-10-16 11:58:11 -07:00
opendiff
p4merge
tkdiff
tortoisemerge
vimdiff
vimdiff2
vimdiff3
xxdiff