git: use diff3 for conflictstyle

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index edd6babf7860b4de6ddb22b1fc59ceb1e0a83d86..0461dfd351206251ee08cba46e03232b1eb6b07a 100644 (file)
--- a/git/config
+++ b/git/config
@@ -24,6 +24,7 @@
 [merge]
        tool = fugitive
        defaultToUpstream = true
+       conflictstyle = diff3
 [mergetool]
        prompt = no
 [rebase]
@@ -36,9 +37,9 @@
 [pull]
        rebase = interactive
 [branch "master"]
-       rebase = preserve
+       rebase = merges
 [branch "develop"]
-       rebase = preserve
+       rebase = merges
 [commit]
        verbose = true
 [alias]