This website requires JavaScript.
Explore
Help
Register
Sign In
git-for-windows
/
git
Watch
1
Star
0
Fork
0
You've already forked git
mirror of
https://github.com/git-for-windows/git.git
synced
2026-05-09 08:15:34 -05:00
Code
Issues
Packages
Projects
Releases
335
Wiki
Activity
Files
2ed06ca2ef7066b323e9f0efbd670bfc4a2c673d
git
/
mergetools
History
…
..
araxis
…
bc
…
bc3
mergetool: rename bc3 to bc
2014-10-21 11:25:30 -07:00
codecompare
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
2016-11-29 10:54:03 -08:00
deltawalker
…
diffmerge
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
2016-11-29 10:54:03 -08:00
diffuse
…
ecmerge
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
2016-11-29 10:54:03 -08:00
emerge
…
examdiff
…
guiffy
…
gvimdiff
…
gvimdiff2
…
gvimdiff3
…
kdiff3
…
kompare
…
meld
mergetools/meld: improve compatibiilty with Meld on macOS X
2017-06-18 22:11:29 -07:00
opendiff
…
p4merge
…
smerge
…
tkdiff
…
tortoisemerge
…
vimdiff
…
vimdiff2
…
vimdiff3
…
winmerge
…
xxdiff
Merge branch 'da/mergetool-xxdiff-hotkey'
2016-12-19 14:45:41 -08:00