From d30b102e4233f52d5b4225fce9f1609e67f6745d Mon Sep 17 00:00:00 2001
From: Julian Prein <julian@druckdev.xyz>
Date: Sat, 21 Sep 2024 00:03:34 +0200
Subject: [PATCH] git: Set `merge.conflictstyle` to `diff3`

Display original text in addition to changes from both sides.
---
 .config/git/config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.config/git/config b/.config/git/config
index edef4df..f6307db 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -87,6 +87,7 @@
 [log]
 	follow = true
 [merge]
+	conflictstyle = diff3
 	log = true
 	suppressDest = *
 [pretty]