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

better config for kdiff3

Browse source
This commit is contained in:
Cyryl Plotnicki-Chudyk 2015-03-10 11:38:47 +01:00
parent cba776f45f
commit 96bd522b1d
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
.kdiff3rc
View file

@ -10,16 +10,16 @@ AutoSaveAndQuitOnMergeWithoutConflicts=0
AutoSelectOutEncoding=1 AutoSelectOutEncoding=1
BgColor=255,255,255 BgColor=255,255,255
BinaryComparison=0 BinaryComparison=0
CaseSensitiveFilenameComparison=1 CaseSensitiveFilenameComparison=0
ColorA=0,0,200 ColorA=0,0,200
ColorB=0,150,0 ColorB=0,150,0
ColorC=150,0,150 ColorC=150,0,150
ColorForConflict=255,0,0 ColorForConflict=255,0,0
CopyNewer=0 CopyNewer=0
CreateBakFiles=1 CreateBakFiles=0
CurrentRangeBgColor=220,220,100 CurrentRangeBgColor=220,220,100
CurrentRangeDiffBgColor=255,255,150 CurrentRangeDiffBgColor=255,255,150
Diff3AlignBC=0 Diff3AlignBC=1
DiffBgColor=224,224,224 DiffBgColor=224,224,224
DirAntiPattern=CVS;.deps;.svn;.hg;.git DirAntiPattern=CVS;.deps;.svn;.hg;.git
EncodingForA=System EncodingForA=System
@ -34,9 +34,9 @@ FilePattern=*
FindHidden=1 FindHidden=1
FollowDirLinks=0 FollowDirLinks=0
FollowFileLinks=0 FollowFileLinks=0
Font=Courier,10,normal Font=Courier New,10,normal
FullAnalysis=1 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+(.*) 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 HistoryEntryStartSortKeyOrder=4,3,2,5,1,6
HistoryMergeSorting=0 HistoryMergeSorting=0
@ -74,7 +74,7 @@ Show Statusbar=1
Show Toolbar=1 Show Toolbar=1
ShowIdenticalFiles=0 ShowIdenticalFiles=0
ShowInfoDialogs=1 ShowInfoDialogs=1
ShowLineNumbers=1 ShowLineNumbers=0
ShowWhiteSpace=1 ShowWhiteSpace=1
ShowWhiteSpaceCharacters=1 ShowWhiteSpaceCharacters=1
SkipDirStatus=0 SkipDirStatus=0
@ -84,7 +84,7 @@ TrustDate=0
TrustDateFallbackToBinary=0 TrustDateFallbackToBinary=0
TrustSize=0 TrustSize=0
TryHard=1 TryHard=1
UnfoldSubdirs=0 UnfoldSubdirs=1
UseCvsIgnore=0 UseCvsIgnore=0
WhiteSpace2FileMergeDefault=0 WhiteSpace2FileMergeDefault=0
WhiteSpace3FileMergeDefault=0 WhiteSpace3FileMergeDefault=0