diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2016-10-27 22:39:07 -0400 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2016-10-27 22:39:07 -0400 |
| commit | 88786a98d9d9ad5330b166831ce44125fadd1061 (patch) | |
| tree | eb4d25d4797f1fa83136d73fc03a77005147cb83 /init.el | |
| parent | bcb0a3b9a999a10c59599f2e543b3b46d6dc2501 (diff) | |
| download | emacs.d-88786a98d9d9ad5330b166831ce44125fadd1061.tar.gz | |
Set vc-git-resolve-conflicts to nil
Diffstat (limited to 'init.el')
| -rw-r--r-- | init.el | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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 |