From 88786a98d9d9ad5330b166831ce44125fadd1061 Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Thu, 27 Oct 2016 22:39:07 -0400
Subject: Set vc-git-resolve-conflicts to nil

---
 init.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'init.el')

diff --git a/init.el b/init.el
index c22e0a4..44d618d 100644
--- a/init.el
+++ b/init.el
@@ -830,7 +830,9 @@
   (setq vc-follow-symlinks t))
 
 (use-package vc-git
-  :commands vc-git-grep)
+  :commands vc-git-grep
+  :init
+  (setq vc-git-resolve-conflicts nil))
 
 (use-package smerge-mode
   :defer t
-- 
cgit v1.2.3