THIS IS A TEST INSTANCE ONLY! REPOSITORIES CAN BE DELETED AT ANY TIME!

Git Source Code Mirror - This is a publish-only repository and all pull requests are ignored. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
git
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
David Aguilar eb12adc74c mergetools: add support for smerge (Sublime Merge) 7 months ago
..
araxis mergetool: honor mergetool.$tool.trustExitCode for built-in tools 2 years ago
bc mergetool: honor mergetool.$tool.trustExitCode for built-in tools 2 years ago
bc3 mergetool: rename bc3 to bc 5 years ago
codecompare mergetool: honor mergetool.$tool.trustExitCode for built-in tools 2 years ago
deltawalker mergetool: honor mergetool.$tool.trustExitCode for built-in tools 2 years ago
diffmerge mergetool: honor mergetool.$tool.trustExitCode for built-in tools 2 years ago
diffuse mergetool: honor mergetool.$tool.trustExitCode for built-in tools 2 years ago
ecmerge mergetool: honor mergetool.$tool.trustExitCode for built-in tools 2 years ago
emerge mergetool: honor mergetool.$tool.trustExitCode for built-in tools 2 years ago
examdiff mergetool: honor mergetool.$tool.trustExitCode for built-in tools 2 years ago
guiffy mergetools: add support for guiffy 1 year ago
gvimdiff mergetools: simplify how we handle "vim" and "defaults" 6 years ago
gvimdiff2 mergetools: simplify how we handle "vim" and "defaults" 6 years ago
gvimdiff3 mergetools: add vimdiff3 mode 5 years ago
kdiff3 mergetool: honor mergetool.$tool.trustExitCode for built-in tools 2 years ago
kompare mergetool: honor mergetool.$tool.trustExitCode for built-in tools 2 years ago
meld mergetools/meld: improve compatibiilty with Meld on macOS X 2 years ago
opendiff mergetool: honor mergetool.$tool.trustExitCode for built-in tools 2 years ago
p4merge mergetool: honor mergetool.$tool.trustExitCode for built-in tools 2 years ago
smerge mergetools: add support for smerge (Sublime Merge) 7 months ago
tkdiff mergetool: honor mergetool.$tool.trustExitCode for built-in tools 2 years ago
tortoisemerge mergetool: honor mergetool.$tool.trustExitCode for built-in tools 2 years ago
vimdiff mergetools/vimdiff: trust Vim's exit code 2 years ago
vimdiff2 mergetools: simplify how we handle "vim" and "defaults" 6 years ago
vimdiff3 mergetools: add vimdiff3 mode 5 years ago
winmerge mergetool: honor mergetool.$tool.trustExitCode for built-in tools 2 years ago
xxdiff Merge branch 'da/mergetool-xxdiff-hotkey' 2 years ago