From 48a3abb8f6ead192f1657023561b32fa4ae86e2c Mon Sep 17 00:00:00 2001
From: Price Hiller <price@orion-technologies.io>
Date: Sun, 28 Aug 2022 16:21:52 -0500
Subject: [PATCH] feat(git): better conflict styling

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

diff --git a/dots/.gitconfig b/dots/.gitconfig
index 82ad4c45..5e77ada8 100644
--- a/dots/.gitconfig
+++ b/dots/.gitconfig
@@ -46,3 +46,5 @@
     unstage = reset HEAD --
 [push]
     autoSetupRemote = true
+[merge]
+    conflictstyle = diff3