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

186
.kdiff3rc
View file

@ -1,93 +1,93 @@
AutoAdvance=0 AutoAdvance=0
AutoAdvanceDelay=500 AutoAdvanceDelay=500
AutoCopySelection=0 AutoCopySelection=0
AutoDetectUnicodeA=1 AutoDetectUnicodeA=1
AutoDetectUnicodeB=1 AutoDetectUnicodeB=1
AutoDetectUnicodeC=1 AutoDetectUnicodeC=1
AutoIndentation=1 AutoIndentation=1
AutoMergeRegExp=.*\\$(Version\|Header\|Date\|Author).*\\$.* AutoMergeRegExp=.*\\$(Version\|Header\|Date\|Author).*\\$.*
AutoSaveAndQuitOnMergeWithoutConflicts=0 AutoSaveAndQuitOnMergeWithoutConflicts=0
AutoSelectOutEncoding=1 AutoSelectOutEncoding=1
BgColor=255,255,255 BgColor=255,255,255
BinaryComparison=0 BinaryComparison=0
CaseSensitiveFilenameComparison=1 CaseSensitiveFilenameComparison=1
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=1
CurrentRangeBgColor=220,220,100 CurrentRangeBgColor=220,220,100
CurrentRangeDiffBgColor=255,255,150 CurrentRangeDiffBgColor=255,255,150
Diff3AlignBC=0 Diff3AlignBC=0
DiffBgColor=224,224,224 DiffBgColor=224,224,224
DirAntiPattern=CVS;.deps;.svn;.hg;.git DirAntiPattern=CVS;.deps;.svn;.hg;.git
EncodingForA=System EncodingForA=System
EncodingForB=System EncodingForB=System
EncodingForC=System EncodingForC=System
EncodingForOutput=System EncodingForOutput=System
EncodingForPP=System EncodingForPP=System
EscapeKeyQuits=0 EscapeKeyQuits=0
FgColor=0,0,0 FgColor=0,0,0
FileAntiPattern=*.orig;*.o;*.obj;*.rej;*.bak FileAntiPattern=*.orig;*.o;*.obj;*.rej;*.bak
FilePattern=* FilePattern=*
FindHidden=1 FindHidden=1
FollowDirLinks=0 FollowDirLinks=0
FollowFileLinks=0 FollowFileLinks=0
Font=Courier,10,normal Font=Courier,10,normal
FullAnalysis=1 FullAnalysis=1
Geometry=960,454 Geometry=960,454
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
HistoryStartRegExp=.*\\$Log.*\\$.* HistoryStartRegExp=.*\\$Log.*\\$.*
HorizDiffWindowSplitting=1 HorizDiffWindowSplitting=1
IgnorableCmdLineOptions=-u;-query;-html;-abort IgnorableCmdLineOptions=-u;-query;-html;-abort
IgnoreCase=0 IgnoreCase=0
IgnoreComments=0 IgnoreComments=0
IgnoreNumbers=0 IgnoreNumbers=0
IrrelevantMergeCmd= IrrelevantMergeCmd=
ItalicForDeltas=0 ItalicForDeltas=0
Language=Auto Language=Auto
LineEndStyle=2 LineEndStyle=2
LineMatchingPreProcessorCmd= LineMatchingPreProcessorCmd=
ManualAlignmentRangeColor=255,208,128 ManualAlignmentRangeColor=255,208,128
MaxNofHistoryEntries=-1 MaxNofHistoryEntries=-1
MidAgeFileColor=192,192,0 MidAgeFileColor=192,192,0
MissingFileColor=0,0,0 MissingFileColor=0,0,0
NewestFileColor=0,208,0 NewestFileColor=0,208,0
OldestFileColor=240,0,0 OldestFileColor=240,0,0
Position=0,22 Position=0,22
PreProcessorCmd= PreProcessorCmd=
RecentAFiles= RecentAFiles=
RecentBFiles= RecentBFiles=
RecentCFiles= 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
SameEncoding=1 SameEncoding=1
Show Statusbar=1 Show Statusbar=1
Show Toolbar=1 Show Toolbar=1
ShowIdenticalFiles=0 ShowIdenticalFiles=0
ShowInfoDialogs=1 ShowInfoDialogs=1
ShowLineNumbers=1 ShowLineNumbers=1
ShowWhiteSpace=1 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
TryHard=1 TryHard=1
UnfoldSubdirs=0 UnfoldSubdirs=0
UseCvsIgnore=0 UseCvsIgnore=0
WhiteSpace2FileMergeDefault=0 WhiteSpace2FileMergeDefault=0
WhiteSpace3FileMergeDefault=0 WhiteSpace3FileMergeDefault=0
WhiteSpaceEqual=1 WhiteSpaceEqual=1
WindowStateMaximised=1 WindowStateMaximised=1
WordWrap=0 WordWrap=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=""