summaryrefslogtreecommitdiffstats
path: root/lisp/init-git.el
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2021-03-27 21:49:26 +0100
committerMartin Polden <mpolden@mpolden.no>2021-03-27 21:49:26 +0100
commit3bd0357dd615c0b828410dc4d723411c2e481a12 (patch)
tree47e6f004e5f017a4469dc991f2048059a6ac66af /lisp/init-git.el
parente7852c019660878c5115e19ca0401f29c98b2049 (diff)
git: Defer loading of smerge-mode
Diffstat (limited to 'lisp/init-git.el')
-rw-r--r--lisp/init-git.el1
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/init-git.el b/lisp/init-git.el
index 8a293af..996119f 100644
--- a/lisp/init-git.el
+++ b/lisp/init-git.el
@@ -52,6 +52,7 @@ If NOSELECT is non-nil, do not select the window."
(setq git-commit-major-mode 'gfm-mode))
(use-package smerge-mode
+ :defer t
:init
(setq smerge-command-prefix (kbd "C-c x")))