3 Commits

Author	SHA1	Message	Date
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
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
Henrik Lissner	60779c9aed	feature/version-control => ui/vc-gutter, emacs/vc ... Reorganize vcs functionality. Moves the custom fringe bitmaps into :ui vc-gutter.	2018-06-22 01:49:20 +02:00