From 5829b6b1d3f2bab6bbdeef92f7b3e0f85db6ca33 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 11 Apr 2020 02:17:51 +0100
Subject: [PATCH] dot/emacs: Don't automatically stage files after resolving
 conflicts.

I like to check the combined diff before staging, to make sure that my
proposed resolution looks right.
---
 dot/emacs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dot/emacs b/dot/emacs
index 4f1fb58..79220bd 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -373,7 +373,8 @@
 (setq find-ls-option			;Build file lists efficiently
       '("-print0 | xargs -0r ls -ld" . "ld"))
 (setq bookmark-save-flag 0)		;Save bookmarks automatically
-(setq vc-follow-symlinks t)
+(setq vc-follow-symlinks t
+      vc-git-resolve-conflicts nil)
 (setq x-gtk-file-dialog-help-text nil)
 (setq use-dialog-box nil)
 (setq Info-fontify-maximum-menu-size 100000)
-- 
2.11.0