diff options
| author | Martin Polden <mpolden@mpolden.no> | 2020-04-28 22:59:41 +0200 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2020-04-28 22:59:41 +0200 |
| commit | 2e7c79eeadad62ef1eb1326932e1c915ec8637be (patch) | |
| tree | 169ed6a55b3b17cff4b6c692286984855e04a02a /lisp/init-git.el | |
| parent | 8cc8c95e1fee7b9bb5215a5f9796e82a728bb19b (diff) | |
Use C-c x as smerge prefix
Diffstat (limited to 'lisp/init-git.el')
| -rw-r--r-- | lisp/init-git.el | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/init-git.el b/lisp/init-git.el index 23e3e4c..7d91da6 100644 --- a/lisp/init-git.el +++ b/lisp/init-git.el @@ -49,4 +49,9 @@ ;; follow symlinks to files under version control (setq vc-follow-symlinks t) +(use-package smerge-mode + :ensure nil ;; package is bundled with emacs + :init + (setq smerge-command-prefix (kbd "C-c x"))) + (provide 'init-git) |