kdiff3 config for windows

.gitconfig_includes.cygwin

@@ -10,7 +10,7 @@
     trustExitCode = false
     keepBackup = false
 [merge]
-    tool = vimdiff
+    tool = kdiff3
 
 [core]
 	autocrlf = false

.kdiff3rc

@@ -65,7 +65,7 @@ RecentCFiles=
 RecentEncodings=
 RecentOutputFiles=
 RecursiveDirs=1
-ReplaceTabs=0
+ReplaceTabs=1
 RightToLeftLanguage=0
 RunHistoryAutoMergeOnMergeStart=0
 RunRegExpAutoMergeOnMergeStart=0
@@ -79,7 +79,7 @@ ShowWhiteSpace=1
 ShowWhiteSpaceCharacters=1
 SkipDirStatus=0
 SyncMode=0
-TabSize=8
+TabSize=4
 TrustDate=0
 TrustDateFallbackToBinary=0
 TrustSize=0

.vimrc

@@ -48,3 +48,6 @@ set laststatus=2
 set noshowmode
 set showtabline=1 "only show tabline when more than 1 tab
 
+" vimdiff
+set diffopt+=iwhite
+set diffexpr=""