Junio C Hamano 6d1f93acfa 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

2017-01-17 15:11:05 -08:00

..

araxis

mergetool: honor mergetool.$tool.trustExitCode for built-in tools

2016-11-29 10:54:03 -08:00

bc

mergetool: honor mergetool.$tool.trustExitCode for built-in tools

2016-11-29 10:54:03 -08:00

bc3

mergetool: rename bc3 to bc

2014-10-21 11:25:30 -07:00

codecompare

mergetool: honor mergetool.$tool.trustExitCode for built-in tools

2016-11-29 10:54:03 -08:00

deltawalker

mergetool: honor mergetool.$tool.trustExitCode for built-in tools

2016-11-29 10:54:03 -08:00

diffmerge

mergetool: honor mergetool.$tool.trustExitCode for built-in tools

2016-11-29 10:54:03 -08:00

diffuse

mergetool: honor mergetool.$tool.trustExitCode for built-in tools

2016-11-29 10:54:03 -08:00

ecmerge

mergetool: honor mergetool.$tool.trustExitCode for built-in tools

2016-11-29 10:54:03 -08:00

emerge

mergetool: honor mergetool.$tool.trustExitCode for built-in tools

2016-11-29 10:54:03 -08:00

examdiff

mergetool: honor mergetool.$tool.trustExitCode for built-in tools

2016-11-29 10:54:03 -08:00

gvimdiff

mergetools: simplify how we handle "vim" and "defaults"

2013-01-28 19:00:38 -08:00

gvimdiff2

mergetools: simplify how we handle "vim" and "defaults"

2013-01-28 19:00:38 -08:00

gvimdiff3

mergetools: add vimdiff3 mode

2014-04-22 12:49:07 -07:00

kdiff3

mergetool: honor mergetool.$tool.trustExitCode for built-in tools

2016-11-29 10:54:03 -08:00

kompare

mergetool: honor mergetool.$tool.trustExitCode for built-in tools

2016-11-29 10:54:03 -08:00

meld

mergetool: honor mergetool.$tool.trustExitCode for built-in tools

2016-11-29 10:54:03 -08:00

opendiff

mergetool: honor mergetool.$tool.trustExitCode for built-in tools

2016-11-29 10:54:03 -08:00

p4merge

mergetool: honor mergetool.$tool.trustExitCode for built-in tools

2016-11-29 10:54:03 -08:00

tkdiff

mergetool: honor mergetool.$tool.trustExitCode for built-in tools

2016-11-29 10:54:03 -08:00

tortoisemerge

mergetool: honor mergetool.$tool.trustExitCode for built-in tools

2016-11-29 10:54:03 -08:00

vimdiff

mergetools/vimdiff: trust Vim's exit code

2016-11-29 10:57:41 -08:00

vimdiff2

mergetools: simplify how we handle "vim" and "defaults"

2013-01-28 19:00:38 -08:00

vimdiff3

mergetools: add vimdiff3 mode

2014-04-22 12:49:07 -07:00

winmerge

mergetool: honor mergetool.$tool.trustExitCode for built-in tools

2016-11-29 10:54:03 -08:00

xxdiff

Merge branch 'da/mergetool-xxdiff-hotkey' into maint

2017-01-17 15:11:05 -08:00