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-06 15:23:09 -05:00
Code
Issues
Packages
Projects
Releases
335
Wiki
Activity
Files
a23ccd71e76fc700eaefbdcf2d6bd4a39fc22df1
git
/
mergetools
History
…
..
araxis
…
bc
…
codecompare
…
deltawalker
…
diffmerge
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
2016-11-29 10:54:03 -08:00
diffuse
…
ecmerge
…
emerge
…
examdiff
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
2016-11-29 10:54:03 -08:00
guiffy
…
gvimdiff
…
kdiff3
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
2016-11-29 10:54:03 -08:00
kompare
…
meld
…
nvimdiff
…
opendiff
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
2016-11-29 10:54:03 -08:00
p4merge
…
smerge
…
tkdiff
…
tortoisemerge
…
vimdiff
…
winmerge
…
xxdiff
Merge branch 'da/mergetool-xxdiff-hotkey'
2016-12-19 14:45:41 -08:00