summary refs log tree commit diff stats
path: root/tag-emacs
diff options
context:
space:
mode:
Diffstat (limited to 'tag-emacs')
-rw-r--r--tag-emacs/emacs.d/init.el1
1 files changed, 1 insertions, 0 deletions
diff --git a/tag-emacs/emacs.d/init.el b/tag-emacs/emacs.d/init.el
index a284eefc..617f61ae 100644
--- a/tag-emacs/emacs.d/init.el
+++ b/tag-emacs/emacs.d/init.el
@@ -799,6 +799,7 @@
 
 (req-package vc
   :defer t
+  :bind (("C-x v C" . vc-resolve-conflicts))
   :config (progn
             (setq vc-follow-symlinks t)))