Latest commit 6d1f93a Jan 18, 2017 @gitster gitster Merge branch 'da/mergetool-xxdiff-hotkey' into maint
The way to specify hotkeys to "xxdiff" that is used by "git
mergetool" has been modernized to match recent versions of xxdiff.

* da/mergetool-xxdiff-hotkey:
  mergetools: fix xxdiff hotkeys
Permalink
..
Failed to load latest commit information.
araxis mergetool: honor mergetool.$tool.trustExitCode for built-in tools Nov 29, 2016
bc mergetool: honor mergetool.$tool.trustExitCode for built-in tools Nov 29, 2016
bc3 mergetool: rename bc3 to bc Oct 21, 2014
codecompare mergetool: honor mergetool.$tool.trustExitCode for built-in tools Nov 29, 2016
deltawalker mergetool: honor mergetool.$tool.trustExitCode for built-in tools Nov 29, 2016
diffmerge mergetool: honor mergetool.$tool.trustExitCode for built-in tools Nov 29, 2016
diffuse mergetool: honor mergetool.$tool.trustExitCode for built-in tools Nov 29, 2016
ecmerge mergetool: honor mergetool.$tool.trustExitCode for built-in tools Nov 29, 2016
emerge mergetool: honor mergetool.$tool.trustExitCode for built-in tools Nov 29, 2016
examdiff mergetool: honor mergetool.$tool.trustExitCode for built-in tools Nov 29, 2016
gvimdiff mergetools: simplify how we handle "vim" and "defaults" Jan 29, 2013
gvimdiff2 mergetools: simplify how we handle "vim" and "defaults" Jan 29, 2013
gvimdiff3 mergetools: add vimdiff3 mode Apr 22, 2014
kdiff3 mergetool: honor mergetool.$tool.trustExitCode for built-in tools Nov 29, 2016
kompare mergetool: honor mergetool.$tool.trustExitCode for built-in tools Nov 29, 2016
meld mergetool: honor mergetool.$tool.trustExitCode for built-in tools Nov 29, 2016
opendiff mergetool: honor mergetool.$tool.trustExitCode for built-in tools Nov 29, 2016
p4merge mergetool: honor mergetool.$tool.trustExitCode for built-in tools Nov 29, 2016
tkdiff mergetool: honor mergetool.$tool.trustExitCode for built-in tools Nov 29, 2016
tortoisemerge mergetool: honor mergetool.$tool.trustExitCode for built-in tools Nov 29, 2016
vimdiff mergetools/vimdiff: trust Vim's exit code Nov 29, 2016
vimdiff2 mergetools: simplify how we handle "vim" and "defaults" Jan 29, 2013
vimdiff3 mergetools: add vimdiff3 mode Apr 22, 2014
winmerge mergetool: honor mergetool.$tool.trustExitCode for built-in tools Nov 29, 2016
xxdiff Merge branch 'da/mergetool-xxdiff-hotkey' Dec 19, 2016