From 36c5d7617b4398235d3b2d3e61688b269e03ec5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Dudr?= <vladimir@tango-dj.cz>
Date: Fri, 3 Jun 2022 10:04:06 +0200
Subject: [PATCH] git: mergetool

---
 dot_config/git/config | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dot_config/git/config b/dot_config/git/config
index bcd8700..8be12e8 100644
--- a/dot_config/git/config
+++ b/dot_config/git/config
@@ -37,3 +37,7 @@
     smtpserver = /usr/bin/msmtp
     smtpserveroption = -a
     smtpserveroption = tdj
+
+[merge]
+    tool = vimdiff
+    conflictstyle = diff3