Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
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.
 
 
 
 
 
 
Junio C Hamano b9a5e34162 Sync with master 12 hours ago
..
araxis mergetool: honor mergetool.$tool.trustExitCode for built-in tools 5 years ago
bc mergetools/bc: add `bc4` to the alias list for Beyond Compare 7 months ago
codecompare mergetool: honor mergetool.$tool.trustExitCode for built-in tools 5 years ago
deltawalker mergetool: honor mergetool.$tool.trustExitCode for built-in tools 5 years ago
diffmerge mergetool: honor mergetool.$tool.trustExitCode for built-in tools 5 years ago
diffuse mergetool: honor mergetool.$tool.trustExitCode for built-in tools 5 years ago
ecmerge mergetool: honor mergetool.$tool.trustExitCode for built-in tools 5 years ago
emerge mergetool: honor mergetool.$tool.trustExitCode for built-in tools 5 years ago
examdiff mergetool: honor mergetool.$tool.trustExitCode for built-in tools 5 years ago
guiffy mergetools: add support for guiffy 3 years ago
gvimdiff mergetools: simplify how we handle "vim" and "defaults" 8 years ago
kdiff3 mergetool: honor mergetool.$tool.trustExitCode for built-in tools 5 years ago
kompare mergetool: honor mergetool.$tool.trustExitCode for built-in tools 5 years ago
meld mergetool: allow auto-merge for meld to follow the vim-diff behavior 9 months ago
nvimdiff mergetools: add support for nvimdiff (neovim) family 11 months ago
opendiff mergetool: honor mergetool.$tool.trustExitCode for built-in tools 5 years ago
p4merge mergetool: honor mergetool.$tool.trustExitCode for built-in tools 5 years ago
smerge mergetools: add support for smerge (Sublime Merge) 2 years ago
tkdiff mergetool: honor mergetool.$tool.trustExitCode for built-in tools 5 years ago
tortoisemerge mergetool: honor mergetool.$tool.trustExitCode for built-in tools 5 years ago
vimdiff mergetools/vimdiff: add vimdiff1 merge tool variant 4 months ago
winmerge mergetool: honor mergetool.$tool.trustExitCode for built-in tools 5 years ago
xxdiff Merge branch 'da/mergetool-xxdiff-hotkey' 5 years ago