From 96bd522b1d9352c6f1b1ff66fb270f40f30d9ab8 Mon Sep 17 00:00:00 2001
From: Cyryl Plotnicki-Chudyk <cyplo@cyplo.net>
Date: Tue, 10 Mar 2015 11:38:47 +0100
Subject: [PATCH] better config for kdiff3

---
 .kdiff3rc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.kdiff3rc b/.kdiff3rc
index f42b40c5..7f788c6d 100644
--- a/.kdiff3rc
+++ b/.kdiff3rc
@@ -10,16 +10,16 @@ AutoSaveAndQuitOnMergeWithoutConflicts=0
 AutoSelectOutEncoding=1
 BgColor=255,255,255
 BinaryComparison=0
-CaseSensitiveFilenameComparison=1
+CaseSensitiveFilenameComparison=0
 ColorA=0,0,200
 ColorB=0,150,0
 ColorC=150,0,150
 ColorForConflict=255,0,0
 CopyNewer=0
-CreateBakFiles=1
+CreateBakFiles=0
 CurrentRangeBgColor=220,220,100
 CurrentRangeDiffBgColor=255,255,150
-Diff3AlignBC=0
+Diff3AlignBC=1
 DiffBgColor=224,224,224
 DirAntiPattern=CVS;.deps;.svn;.hg;.git
 EncodingForA=System
@@ -34,9 +34,9 @@ FilePattern=*
 FindHidden=1
 FollowDirLinks=0
 FollowFileLinks=0
-Font=Courier,10,normal
+Font=Courier New,10,normal
 FullAnalysis=1
-Geometry=960,454
+Geometry=600,400
 HistoryEntryStartRegExp=\\s*\\\\main\\\\(\\S+)\\s+([0-9]+) (Jan\|Feb\|Mar\|Apr\|May\|Jun\|Jul\|Aug\|Sep\|Oct\|Nov\|Dec) ([0-9][0-9][0-9][0-9]) ([0-9][0-9]:[0-9][0-9]:[0-9][0-9])\\s+(.*)
 HistoryEntryStartSortKeyOrder=4,3,2,5,1,6
 HistoryMergeSorting=0
@@ -74,7 +74,7 @@ Show Statusbar=1
 Show Toolbar=1
 ShowIdenticalFiles=0
 ShowInfoDialogs=1
-ShowLineNumbers=1
+ShowLineNumbers=0
 ShowWhiteSpace=1
 ShowWhiteSpaceCharacters=1
 SkipDirStatus=0
@@ -84,7 +84,7 @@ TrustDate=0
 TrustDateFallbackToBinary=0
 TrustSize=0
 TryHard=1
-UnfoldSubdirs=0
+UnfoldSubdirs=1
 UseCvsIgnore=0
 WhiteSpace2FileMergeDefault=0
 WhiteSpace3FileMergeDefault=0