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.

diff --git a/dot/emacs b/dot/emacs
index 4f1fb58..79220bd 100644 (file)
--- 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)