mirror of
https://github.com/doomemacs/doomemacs
synced 2025-08-01 12:17:25 -05:00
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.