From 7be6383e4cec5a4162c495a90b326d3be47ad354 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Fri, 1 Aug 2014 17:21:17 +0100
Subject: Emacs: Bind C-x v C to vc-resolve-conflicts

---
 tag-emacs/emacs.d/init.el | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tag-emacs')

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)))
 
-- 
cgit 1.4.1