From fb02663f5f05e22ad7123b1e6b5431302a97ef20 Mon Sep 17 00:00:00 2001
From: "R. Steve McKown" <rsmckown@gmail.com>
Date: Fri, 11 Mar 2016 15:31:59 -0700
Subject: [PATCH] .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.
---
 gitconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gitconfig b/gitconfig
index 0f4f4e6..03591f1 100644
--- 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]
-- 
2.39.2