From cb12dc7400d52d8c75c600c0bd943984f603ea78 Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Wed, 29 Jan 2014 10:38:06 +0100
Subject: misc cleanup

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 .gitconfig | 1 +
 1 file changed, 1 insertion(+)

(limited to '.gitconfig')

diff --git a/.gitconfig b/.gitconfig
index 425f6a8..8eebcf8 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -20,6 +20,7 @@
 	refl = reflog --date=relative
 [merge]
 	tool = vimdiff
+	conflictstyle = diff3
 [push]
 	default = current
 [color]
-- 
cgit v1.2.3-24-g4f1b