From da5f76b070d65514e0f3e0689e5f9bcdc2be0649 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 23 Apr 2023 14:31:36 +0200
Subject: [PATCH] git/config: move to diff3 conflicts

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

diff --git a/git/gitconfig b/git/gitconfig
index 71b652b..76729f2 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -9,6 +9,7 @@
 [merge]
 	defaultToUpstream = true
 	tool = vimdiff
+	conflictstyle = diff3
 [core]
 	editor = vim
 	eol = native