From 047ccf41d66f15c7f877d582861be7aea49d0d84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20P=C5=82azie=C5=84ski?= <nivertius@gmail.com>
Date: Thu, 10 Mar 2016 10:46:50 +0100
Subject: [PATCH] added meld as merge tool

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

diff --git a/.gitconfig b/.gitconfig
index 15b698d..22b222d 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -14,3 +14,5 @@
 	editor = vim
 [diff]
 	tool = meld
+[merge]
+	tool = meld