summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--init.el4
1 files changed, 3 insertions, 1 deletions
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