From 89b93207c70f321c5ea1d4a1ab368b1e9d09b4b8 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Wed, 17 Feb 2016 09:49:37 +0200
Subject: [PATCH] Configure graphical diff tool.

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

diff --git a/.gitconfig b/.gitconfig
index 3fe0704..7635593 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -14,3 +14,9 @@
     fsckobjects = true
 [receive]
     fsckObjects = true
+[merge]
+	tool = kompare
+[diff]
+	tool = kompare
+[difftool]
+	prompt = false
-- 
GitLab