From 7d4e199df2b57b4c7f7cbdacc7792d71bb56a538 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Sat, 12 Sep 2020 11:32:51 +0200
Subject: Some fixes

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

(limited to '.gitconfig')

diff --git a/.gitconfig b/.gitconfig
index d582072..056e73c 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -6,3 +6,5 @@
 	ff = only
 [commit]
 	gpgsign = true
+[merge]
+	tool = vimdiff
-- 
cgit v1.2.3