From df3eabfaef5043796d675070734f475ab03e58b0 Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Sun, 28 Mar 2021 12:00:11 +0200 Subject: git: Set command for smerge-mode --- lisp/init-git.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lisp/init-git.el') diff --git a/lisp/init-git.el b/lisp/init-git.el index aa0dba6..b598dc5 100644 --- a/lisp/init-git.el +++ b/lisp/init-git.el @@ -57,7 +57,8 @@ If NOSELECT is non-nil, do not select the window." (setq git-commit-major-mode 'gfm-mode)) (use-package smerge-mode - :defer t + ;; vc-git-find-file-hook calls this command + :commands smerge-start-session :init (setq smerge-command-prefix (kbd "C-c x"))) -- cgit v1.2.3