From 77a279f8ad57781079ce41716eb332c974e9b3f8 Mon Sep 17 00:00:00 2001
From: Tobias Schmidl <tobias.schmidl@corpuls.com>
Date: Thu, 17 May 2018 12:57:53 +0200
Subject: [PATCH] use vim for merging

---
 gitconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gitconfig b/gitconfig
index 8b47271..07786c2 100644
--- a/gitconfig
+++ b/gitconfig
@@ -23,6 +23,7 @@
 [merge]
 	conflictstyle = diff3
 	renormalize = true
+	tool = vimdiff3
 [pack]
 	threads = 0
 [pull]