From 4da2fd9872bbeeda559a4ff8246d0b13c152f943 Mon Sep 17 00:00:00 2001
From: Miquel Sabaté Solà <msabate@suse.com>
Date: Thu, 14 Apr 2016 23:43:03 +0200
Subject: git: use vimdiff as the merge tool
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Miquel Sabaté Solà <msabate@suse.com>
---
 gitconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gitconfig b/gitconfig
index f56aac4..134da2d 100644
--- a/gitconfig
+++ b/gitconfig
@@ -32,6 +32,9 @@
 [color]
   ui = true
 
+[merge]
+  tool = vimdiff
+
 [url "git://github.com/mssola/"]
   insteadOf = mssola:
 [url "git@github.com:mssola/"]
-- 
cgit v1.2.3