.gitconfig: use merge conflictstyle diff3

This conflictstyle seems to be easier for me when doing three-way merges
in some very complex cases where vimdiff or kdiff with 4 panes open
doesn't help enough.

diff --git a/gitconfig b/gitconfig
index 0f4f4e61e9b9a48c3ff209aeafc9d15bcf56f8ba..03591f193625cc2d804cd574e1f82e74bd649a71 100644 (file)
--- a/gitconfig
+++ b/gitconfig
@@ -8,13 +8,14 @@
 [log]
        decorate = true
 [diff]
-        ; diff.tool kdiff3 useful for 'git diffall'
+       ; diff.tool kdiff3 useful for 'git diffall'
        tool = kdiff3
        mnemonicprefix = true
 [difftool]
        prompt = false
 [merge]
        tool = vimdiff
+       conflictstyle = diff3
 [mergetool]
        prompt = false
 [push]