From 348f62c5572188e6517ab074bc53bcc7cb084525 Mon Sep 17 00:00:00 2001
From: Colin McMillen <colin@semicolin.games>
Date: Wed, 9 Jun 2021 13:10:08 -0400
Subject: [PATCH] gitconfig: add conflictstyle=diff3

---
 gitconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gitconfig b/gitconfig
index 23792f4..bd92cd8 100644
--- a/gitconfig
+++ b/gitconfig
@@ -3,3 +3,5 @@
 	email = colin@semicolin.games
 [init]
 	defaultBranch = main
+[merge]
+	conflictstyle = diff3