8148a0b0ec
* kdiff3 config updated to a newer version * fresh system configuration files now know about kdiff3
100 lines
2.5 KiB
Plaintext
100 lines
2.5 KiB
Plaintext
[KDiff3 Options]
|
|
AutoAdvance=false
|
|
AutoAdvanceDelay=500
|
|
AutoCopySelection=false
|
|
AutoDetectUnicodeA=true
|
|
AutoDetectUnicodeB=true
|
|
AutoDetectUnicodeC=true
|
|
AutoIndentation=true
|
|
AutoMergeRegExp=.*\\\\$(Version|Header|Date|Author).*\\\\$.*
|
|
AutoSaveAndQuitOnMergeWithoutConflicts=false
|
|
AutoSelectOutEncoding=true
|
|
BgColor=255,255,255
|
|
BinaryComparison=false
|
|
CaseSensitiveFilenameComparison=true
|
|
ColorA=0,0,200
|
|
ColorB=0,150,0
|
|
ColorC=150,0,150
|
|
ColorForConflict=255,0,0
|
|
CopyNewer=false
|
|
CreateBakFiles=false
|
|
CurrentRangeBgColor=220,220,100
|
|
CurrentRangeDiffBgColor=255,255,150
|
|
Diff3AlignBC=true
|
|
DiffBgColor=224,224,224
|
|
DirAntiPattern=CVS;.deps;.svn;.hg;.git
|
|
EncodingForA=UTF-8
|
|
EncodingForB=UTF-8
|
|
EncodingForC=UTF-8
|
|
EncodingForOutput=UTF-8
|
|
EncodingForPP=UTF-8
|
|
EscapeKeyQuits=false
|
|
FgColor=0,0,0
|
|
FileAntiPattern=*.orig;*.o;*.obj;*.rej;*.bak
|
|
FilePattern=*
|
|
FindHidden=true
|
|
FollowDirLinks=false
|
|
FollowFileLinks=false
|
|
Font=Monospace,9,-1,5,50,0,0,0,0,0
|
|
FullAnalysis=true
|
|
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=false
|
|
HistoryStartRegExp=.*\\\\$Log.*\\\\$.*
|
|
HorizDiffWindowSplitting=true
|
|
IgnorableCmdLineOptions=-u;-query;-html;-abort
|
|
IgnoreCase=false
|
|
IgnoreComments=false
|
|
IgnoreNumbers=false
|
|
IrrelevantMergeCmd=\\0
|
|
ItalicForDeltas=false
|
|
LineEndStyle=2
|
|
LineMatchingPreProcessorCmd=\\0
|
|
ManualAlignmentRangeColor=255,208,128
|
|
MaxNofHistoryEntries=-1
|
|
MidAgeFileColor=192,192,0
|
|
MissingFileColor=0,0,0
|
|
NewestFileColor=0,208,0
|
|
OldestFileColor=240,0,0
|
|
Position=0,22
|
|
PreProcessorCmd=\\0
|
|
RecentAFiles=
|
|
RecentBFiles=
|
|
RecentCFiles=
|
|
RecentEncodings=
|
|
RecentOutputFiles=
|
|
RecursiveDirs=true
|
|
ReplaceTabs=true
|
|
RightToLeftLanguage=false
|
|
RunHistoryAutoMergeOnMergeStart=false
|
|
RunRegExpAutoMergeOnMergeStart=false
|
|
SameEncoding=true
|
|
Show Statusbar=true
|
|
Show Toolbar=true
|
|
ShowIdenticalFiles=true
|
|
ShowInfoDialogs=true
|
|
ShowLineNumbers=false
|
|
ShowWhiteSpace=true
|
|
ShowWhiteSpaceCharacters=true
|
|
SkipDirStatus=true
|
|
SyncMode=false
|
|
TabSize=4
|
|
TrustDate=false
|
|
TrustDateFallbackToBinary=false
|
|
TrustSize=false
|
|
TryHard=true
|
|
UnfoldSubdirs=true
|
|
UseCvsIgnore=false
|
|
WhiteSpace2FileMergeDefault=0
|
|
WhiteSpace3FileMergeDefault=0
|
|
WhiteSpaceEqual=true
|
|
WindowStateMaximised=true
|
|
WordWrap=false
|
|
|
|
[MainWindow]
|
|
Height 768=769
|
|
State=AAAA/wAAAAD9AAAAAAAABVYAAAJaAAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAEAAAAWAG0AYQBpAG4AVABvAG8AbABCAGEAcgEAAAAA/////wAAAAAAAAAA
|
|
ToolBarsMovable=Disabled
|
|
Width 1366=1367
|