Junio C Hamano a3c988727d
Merge branch 'da/mergetool-xxdiff-hotkey' ...
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
2016-12-19 14:45:41 -08:00
2016-11-29 10:54:03 -08:00
2016-11-29 10:54:03 -08:00
2016-11-29 10:54:03 -08:00
2016-11-29 10:54:03 -08:00
2016-11-29 10:54:03 -08:00
2016-11-29 10:54:03 -08:00
2016-11-29 10:54:03 -08:00
2016-11-29 10:54:03 -08:00
2016-11-29 10:54:03 -08:00
2016-11-29 10:54:03 -08:00
2016-11-29 10:54:03 -08:00
2016-11-29 10:54:03 -08:00
2016-11-29 10:54:03 -08:00
2016-11-29 10:54:03 -08:00
2016-11-29 10:54:03 -08:00
2016-11-29 10:54:03 -08:00
2016-11-29 10:57:41 -08:00
2016-11-29 10:54:03 -08:00
2016-12-19 14:45:41 -08:00
a3c988727d