Henrik Lissner 3134df8f43 Refactor smerge-mode config ...

Remove +vcs|enable-smerge-mode-maybe, as this is already automatically
enabled when current file is has merge conflicts.

Moved +hydra-smerge to autoloads file, and add it to smerge-mode-hook.

2018-06-26 01:32:05 +02:00

..

autoload.el

Refactor smerge-mode config

2018-06-26 01:32:05 +02:00

config.el

Refactor smerge-mode config

2018-06-26 01:32:05 +02:00

packages.el

feature/version-control => ui/vc-gutter, emacs/vc

2018-06-22 01:49:20 +02:00