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. https://git-scm.com/
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.
 
 
 
 
 
 
git/mergetools
Fernando Ramos 7b5cf8be18 vimdiff: add tool documentation 8 months ago
..
araxis mergetool: honor mergetool.$tool.trustExitCode for built-in tools 6 years ago
bc mergetools/bc: add `bc4` to the alias list for Beyond Compare 2 years ago
codecompare mergetool: honor mergetool.$tool.trustExitCode for built-in tools 6 years ago
deltawalker mergetool: honor mergetool.$tool.trustExitCode for built-in tools 6 years ago
diffmerge mergetool: honor mergetool.$tool.trustExitCode for built-in tools 6 years ago
diffuse mergetool: honor mergetool.$tool.trustExitCode for built-in tools 6 years ago
ecmerge mergetool: honor mergetool.$tool.trustExitCode for built-in tools 6 years ago
emerge mergetool: honor mergetool.$tool.trustExitCode for built-in tools 6 years ago
examdiff mergetool: honor mergetool.$tool.trustExitCode for built-in tools 6 years ago
guiffy mergetools: add support for guiffy 5 years ago
gvimdiff mergetools: simplify how we handle "vim" and "defaults" 10 years ago
kdiff3 mergetools/kdiff3: make kdiff3 work on Windows too 1 year ago
kompare mergetool: honor mergetool.$tool.trustExitCode for built-in tools 6 years ago
meld mergetool: allow auto-merge for meld to follow the vim-diff behavior 2 years ago
nvimdiff mergetools: add support for nvimdiff (neovim) family 2 years ago
opendiff mergetool: honor mergetool.$tool.trustExitCode for built-in tools 6 years ago
p4merge mergetool: honor mergetool.$tool.trustExitCode for built-in tools 6 years ago
smerge mergetools: add support for smerge (Sublime Merge) 4 years ago
tkdiff mergetool: honor mergetool.$tool.trustExitCode for built-in tools 6 years ago
tortoisemerge mergetool: honor mergetool.$tool.trustExitCode for built-in tools 6 years ago
vimdiff vimdiff: add tool documentation 8 months ago
winmerge mergetool: honor mergetool.$tool.trustExitCode for built-in tools 6 years ago
xxdiff mergetools/xxdiff: prevent segfaults from stopping difftool 1 year ago