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-12 18:59:10 -05:00
Code
Issues
Packages
Projects
Releases
335
Wiki
Activity
Files
bfee7f4c51023db0cbc908e2d65290e220e793c0
git
/
mergetools
History
…
..
araxis
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
2016-11-29 10:54:03 -08:00
bc
…
bc3
…
codecompare
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
2016-11-29 10:54:03 -08:00
deltawalker
…
diffmerge
…
diffuse
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
2016-11-29 10:54:03 -08:00
ecmerge
…
emerge
…
examdiff
…
guiffy
…
gvimdiff
…
gvimdiff2
…
gvimdiff3
…
kdiff3
…
kompare
…
meld
…
opendiff
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
2016-11-29 10:54:03 -08:00
p4merge
…
tkdiff
…
tortoisemerge
…
vimdiff
…
vimdiff2
…
vimdiff3
mergetools: add vimdiff3 mode
2014-04-22 12:49:07 -07:00
winmerge
…
xxdiff
…