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-10 01:36:19 -05:00
Code
Issues
Packages
Projects
Releases
335
Wiki
Activity
Files
4ec82ea8cf0b103bbbdcf4bb73cc4bbf74d895dc
git
/
mergetools
History
…
..
araxis
…
bc
…
bc3
…
codecompare
…
deltawalker
…
diffmerge
…
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
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
2016-11-29 10:54:03 -08:00
meld
…
opendiff
…
p4merge
…
smerge
mergetools: add support for smerge (Sublime Merge)
2019-04-04 18:21:25 +09:00
tkdiff
…
tortoisemerge
…
vimdiff
…
vimdiff2
…
vimdiff3
…
winmerge
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
2016-11-29 10:54:03 -08:00
xxdiff
…