diff options
| author | Martin Polden <mpolden@mpolden.no> | 2021-03-28 12:00:11 +0200 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2021-03-28 12:00:11 +0200 |
| commit | df3eabfaef5043796d675070734f475ab03e58b0 (patch) | |
| tree | 592501c132d1372d6e3908c228cb2ba48ccc7104 /lisp/init-git.el | |
| parent | 8c836d63d4e72d284ac025fc41876caa7d5b30c8 (diff) | |
git: Set command for smerge-mode
Diffstat (limited to 'lisp/init-git.el')
| -rw-r--r-- | lisp/init-git.el | 3 |
1 files changed, 2 insertions, 1 deletions
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"))) |