summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--init.el7
1 files changed, 1 insertions, 6 deletions
diff --git a/init.el b/init.el
index 4829445..def97fc 100644
--- a/init.el
+++ b/init.el
@@ -847,12 +847,7 @@
(use-package vc
:init
- (setq vc-follow-symlinks t))
-
-(use-package vc-git
- :commands vc-git-grep
- :init
- (setq vc-git-resolve-conflicts nil))
+ (setq vc-handled-backends nil))
(use-package smerge-mode
:config