From 74d0323c684352f01ea85a321c3b050545ef1e01 Mon Sep 17 00:00:00 2001
From: Kjetil Orbekk <kj@orbekk.com>
Date: Mon, 20 Dec 2021 11:48:14 -0500
Subject: Use diff3 conflict style with git

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

diff --git a/common/.gitconfig b/common/.gitconfig
index fbccce4..2bb8fe5 100644
--- a/common/.gitconfig
+++ b/common/.gitconfig
@@ -15,3 +15,5 @@
 	smtpserverport = 587
 [pull]
 	rebase = true
+[merge]
+	conflictStyle = diff3
-- 
cgit v1.2.3