Henrik Lissner 29c2632cab Fix infinite recursion in smerge-mode #745 ... Also renames +hydra-smerge -> +vc-smerge-hydra, and no longer auto-enables the hydra on smerge-mode (must find a better way).		2018-07-09 21:50:19 +02:00
..
autoload.el	Fix infinite recursion in smerge-mode #745	2018-07-09 21:50:19 +02:00
config.el	Fix infinite recursion in smerge-mode #745	2018-07-09 21:50:19 +02:00
packages.el	feature/version-control => ui/vc-gutter, emacs/vc	2018-06-22 01:49:20 +02:00