From 69c3d6f2287032712102147a215a5456d1105b8a Mon Sep 17 00:00:00 2001
From: Guillaume Dott <guillaume+github@dott.fr>
Date: Thu, 27 Jul 2017 09:51:28 +0200
Subject: [PATCH] git: use vimdiff as mergetool

---
 git/gitconfig.include | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/git/gitconfig.include b/git/gitconfig.include
index 28f03c1..ab3badf 100644
--- a/git/gitconfig.include
+++ b/git/gitconfig.include
@@ -20,7 +20,8 @@
 [diff]
 	tool = vimdiff
 [merge]
-	tool = meld
+	tool = vimdiff
+	conflictstyle = diff3
 [mergetool]
 	keepBackup = false
 [credential]