From 132aeb1789e84da25d49b80b060e152ee373cc9d Mon Sep 17 00:00:00 2001
From: Me <me+git@wadza.fr>
Date: Tue, 7 Apr 2020 16:45:44 +0200
Subject: [PATCH] Add git merge.conflictStyle

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

diff --git a/.gitconfig b/.gitconfig
new file mode 100644
index 0000000..d7832ae
--- /dev/null
+++ b/.gitconfig
@@ -0,0 +1,2 @@
+[merge]
+	conflictStyle = diff3