diff options
-rw-r--r-- | init.el | 7 |
1 files changed, 1 insertions, 6 deletions
@@ -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 |