cyplo/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kdiff3 config for windows

Browse source
This commit is contained in:
Cyryl Plotnicki-Chudyk 2014-02-11 15:17:04 +01:00
parent 40f5186769
commit 95755af553
3 changed files with 97 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitconfig_includes.cygwin
View file

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

4
.kdiff3rc
View file

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

3
.vimrc
View file

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