From 81521bb65dac2b76b3d5868208c37834e7673cce Mon Sep 17 00:00:00 2001
From: Egor Tensin <Egor.Tensin@gmail.com>
Date: Tue, 22 Aug 2017 19:42:39 +0200
Subject: .gitconfig: remove custom KDiff3 settings

It's supported by git anyway.
The only inconvinience is that I'll have to confirm a mergetool every
time there's a conflict, but meh.
---
 %HOME%/.gitconfig | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to '%HOME%/.gitconfig')

diff --git a/%HOME%/.gitconfig b/%HOME%/.gitconfig
index ec18735..4776526 100644
--- a/%HOME%/.gitconfig
+++ b/%HOME%/.gitconfig
@@ -6,16 +6,8 @@
 	autocrlf = false
 [push]
 	default = current
-[merge]
-	tool = kdiff3
-[mergetool "kdiff3"]
+[mergetool]
 	keepBackup = false
-	trustExitCode = false
-[diff]
-	tool = kdiff3
-[difftool "kdiff3"]
-	keepBackup = false
-	trustExitCode = false
 [pull]
 	ff = only
 [alias]
-- 
cgit v1.2.3