From 6710a928972e00efa722cb99b137a30f7d94b7ee Mon Sep 17 00:00:00 2001
From: Oliver Ladner <oliver.ladner@unic.com>
Date: Fri, 16 Aug 2024 10:22:22 +0200
Subject: [PATCH] gitconfig: use diff3 for merges

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

diff --git a/.gitconfig b/.gitconfig
index 8eb371b..f0a497a 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -28,3 +28,5 @@
 	directory = /opt/homebrew
 [init]
 	defaultBranch = main
+[merge]
+	conflictstyle = diff3