From 4a2ab5123eac872d7c16fc4ef14731d053da1f38 Mon Sep 17 00:00:00 2001
From: Curtis McEnroe <programble@gmail.com>
Date: Wed, 21 Feb 2018 19:27:33 -0500
Subject: Git config merge.conflictStyle diff3

This is probably a good idea, though I haven't run into a merge conflict
yet.
---
 home/.config/git/config | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'home/.config')

diff --git a/home/.config/git/config b/home/.config/git/config
index c34f0a9b..b7b53617 100644
--- a/home/.config/git/config
+++ b/home/.config/git/config
@@ -5,6 +5,9 @@
 [commit]
     gpgSign = true
 
+[merge]
+    conflictStyle = diff3
+
 [rebase]
     autosquash = true
 
-- 
cgit 1.4.1