From 006eb493a1f4990ec05f6693396737568635b22b Mon Sep 17 00:00:00 2001
From: Michael Grote <michael.grote@posteo.de>
Date: Thu, 14 Apr 2022 12:22:22 +0200
Subject: [PATCH] =?UTF-8?q?git:=20Einr=C3=BCckung?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitconfig | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitconfig b/.gitconfig
index bd7a80b..73f493f 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -11,4 +11,6 @@
 [help]
 		autocorrect = 20 # https://opensource.com/article/20/11/git-aliases
 [merge]
-	conflictStyle = diff3
+		conflictStyle = diff3
+[safe]
+	  directory = /home/mg/dotfiles