vim/fugitive: winfixheight FugitiveIndex window

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index 954a76ad484406ab36a2dcecca283b43b4394158..926e1fb44a884abd7ad5eef19b2825c4d0869d82 100644 (file)
--- a/git/config
+++ b/git/config
@@ -24,11 +24,13 @@
 [merge]
        tool = fugitive
        defaultToUpstream = true
 [merge]
        tool = fugitive
        defaultToUpstream = true

+       conflictstyle = diff3

 [mergetool]
        prompt = no
 [rebase]
        autostash = true
        autosquash = true
 [mergetool]
        prompt = no
 [rebase]
        autostash = true
        autosquash = true

+       stat = true

 [status]
        submodulesummary = true
 [rerere]
 [status]
        submodulesummary = true
 [rerere]