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 a3c988727d Merge branch 'da/mergetool-xxdiff-hotkey' 8 years ago
..
araxis mergetool: honor mergetool.$tool.trustExitCode for built-in tools 8 years ago
bc mergetool: honor mergetool.$tool.trustExitCode for built-in tools 8 years ago
bc3
codecompare mergetool: honor mergetool.$tool.trustExitCode for built-in tools 8 years ago
deltawalker mergetool: honor mergetool.$tool.trustExitCode for built-in tools 8 years ago
diffmerge mergetool: honor mergetool.$tool.trustExitCode for built-in tools 8 years ago
diffuse mergetool: honor mergetool.$tool.trustExitCode for built-in tools 8 years ago
ecmerge mergetool: honor mergetool.$tool.trustExitCode for built-in tools 8 years ago
emerge mergetool: honor mergetool.$tool.trustExitCode for built-in tools 8 years ago
examdiff mergetool: honor mergetool.$tool.trustExitCode for built-in tools 8 years ago
gvimdiff
gvimdiff2
gvimdiff3
kdiff3 mergetool: honor mergetool.$tool.trustExitCode for built-in tools 8 years ago
kompare mergetool: honor mergetool.$tool.trustExitCode for built-in tools 8 years ago
meld mergetool: honor mergetool.$tool.trustExitCode for built-in tools 8 years ago
opendiff mergetool: honor mergetool.$tool.trustExitCode for built-in tools 8 years ago
p4merge mergetool: honor mergetool.$tool.trustExitCode for built-in tools 8 years ago
tkdiff mergetool: honor mergetool.$tool.trustExitCode for built-in tools 8 years ago
tortoisemerge mergetool: honor mergetool.$tool.trustExitCode for built-in tools 8 years ago
vimdiff mergetools/vimdiff: trust Vim's exit code 8 years ago
vimdiff2
vimdiff3
winmerge mergetool: honor mergetool.$tool.trustExitCode for built-in tools 8 years ago
xxdiff Merge branch 'da/mergetool-xxdiff-hotkey' 8 years ago