all repos — nixfiles @ 7be6383e4cec5a4162c495a90b326d3be47ad354

System and user configuration, managed by nix and home-manager

Emacs: Bind C-x v C to vc-resolve-conflicts
Alan Pearce alan@alanpearce.co.uk
Fri, 01 Aug 2014 17:21:17 +0100
commit

7be6383e4cec5a4162c495a90b326d3be47ad354

parent

01c866e881f21315cb24466e10648b5a25cb0532

1 files changed, 1 insertions(+), 0 deletions(-)

jump to
M tag-emacs/emacs.d/init.eltag-emacs/emacs.d/init.el
@@ -799,6 +799,7 @@ :require (projectile perspective)) 
 (req-package vc
   :defer t
+  :bind (("C-x v C" . vc-resolve-conflicts))
   :config (progn
             (setq vc-follow-symlinks t)))