From ed379819489db2b257d51f024c0518fb5beb804c Mon Sep 17 00:00:00 2001
From: June McEnroe <june@causal.agency>
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(+)

diff --git a/home/.config/git/config b/home/.config/git/config
index cb38682c..5780def4 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