From a7b47fc93a74d3c1f6d8950bda9d0c7d1b46a31f Mon Sep 17 00:00:00 2001
From: Maciej Sobkowski <maciejjo@maciejjo.pl>
Date: Thu, 16 Jun 2016 15:14:53 +0200
Subject: git: Set vimdiff as mergetool

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

(limited to 'git')

diff --git a/git/.gitconfig b/git/.gitconfig
index bed7de3..b287a00 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -10,3 +10,5 @@
 	l  = log --pretty=format:'%Cred%H%Creset -%C(yellow)%d%Creset %s %Cgreen%cr%Creset %Cblue%an%Creset' --abbrev-commit --date=relative
 [color]
 	ui = auto
+[merge]
+	tool = vimdiff
-- 
cgit v1.2.3-70-g09d2