From 3bc2816c22833f41e35aac12d0e9242a067ab95a Mon Sep 17 00:00:00 2001
From: histalek <histalek@posteo.de>
Date: Tue, 7 Nov 2023 15:49:34 +0100
Subject: [PATCH] feat(git): Use 'diff3' style for merge conflicts

---
 .config/git/config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.config/git/config b/.config/git/config
index 4faae7e..480f5af 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -46,6 +46,7 @@
 
 [merge]
   stat = true
+  conflictStyle = diff3
 
 [push]
   default = current