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
..
dired	tools/dired: SPC o - => dired-jump; show symlink targets	2018-06-01 13:46:52 +02:00
ediff	emacs/ediff: remove evil-ediff package	2018-06-12 21:07:34 +02:00
electric	Fix indentation for many autodef setters	2018-06-22 01:49:21 +02:00
eshell	Fix listp errors in eshell when using aliases	2018-06-23 20:29:54 +02:00
imenu	💥 Change set-popup-rule! usage	2018-06-18 02:34:16 +02:00
term	Add set-env! autodef; make :env obsolete	2018-06-15 03:42:01 +02:00
vc	Refactor smerge-mode config	2018-06-26 01:32:05 +02:00