From 63c5cc6cd0e467186b9a8dbf3ae1702453ca13aa Mon Sep 17 00:00:00 2001
From: Johannes Ranke <jranke@uni-bremen.de>
Date: Sat, 12 Nov 2016 16:25:11 +0100
Subject: Use vimdiff for merging

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

diff --git a/gitconfig b/gitconfig
index 936df37..08e0b33 100644
--- a/gitconfig
+++ b/gitconfig
@@ -7,3 +7,5 @@
 [core]
 	excludesfile = ~/.gitignore
 	autocrlf = input
+[merge]
+	tool = vimdiff
-- 
cgit v1.2.1