From 44119f93ceb20dc3deb9d01e5b8b7a8ac398ea5f Mon Sep 17 00:00:00 2001
From: Michael Grote <michael.grote@posteo.de>
Date: Tue, 25 Jan 2022 08:49:02 +0100
Subject: [PATCH] git: diffstyle angepasst

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

diff --git a/.gitconfig b/.gitconfig
index 1358d71..bd7a80b 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -10,3 +10,5 @@
 		editor = vim
 [help]
 		autocorrect = 20 # https://opensource.com/article/20/11/git-aliases
+[merge]
+	conflictStyle = diff3