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

kdiff3 as a default diff tool under linux

Browse source 
* kdiff3 config updated to a newer version
* fresh system configuration files now know about kdiff3
This commit is contained in:
Cyryl Plotnicki-Chudyk 2015-03-11 21:37:36 +01:00
parent 96bd522b1d
commit 8148a0b0ec
3 changed files with 102 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitconfig_includes.common
View file

@ -17,7 +17,7 @@
[diff] [diff]
tool = vimdiff tool = kdiff3
[difftool] [difftool]
prompt = false prompt = false
[merge] [merge]

192
.kdiff3rc
View file

@ -1,93 +1,99 @@
AutoAdvance=0 [KDiff3 Options]
AutoAdvanceDelay=500 AutoAdvance=false
AutoCopySelection=0 AutoAdvanceDelay=500
AutoDetectUnicodeA=1 AutoCopySelection=false
AutoDetectUnicodeB=1 AutoDetectUnicodeA=true
AutoDetectUnicodeC=1 AutoDetectUnicodeB=true
AutoIndentation=1 AutoDetectUnicodeC=true
AutoMergeRegExp=.*\\$(Version\|Header\|Date\|Author).*\\$.* AutoIndentation=true
AutoSaveAndQuitOnMergeWithoutConflicts=0 AutoMergeRegExp=.*\\\\$(Version|Header|Date|Author).*\\\\$.*
AutoSelectOutEncoding=1 AutoSaveAndQuitOnMergeWithoutConflicts=false
BgColor=255,255,255 AutoSelectOutEncoding=true
BinaryComparison=0 BgColor=255,255,255
CaseSensitiveFilenameComparison=0 BinaryComparison=false
ColorA=0,0,200 CaseSensitiveFilenameComparison=true
ColorB=0,150,0 ColorA=0,0,200
ColorC=150,0,150 ColorB=0,150,0
ColorForConflict=255,0,0 ColorC=150,0,150
CopyNewer=0 ColorForConflict=255,0,0
CreateBakFiles=0 CopyNewer=false
CurrentRangeBgColor=220,220,100 CreateBakFiles=false
CurrentRangeDiffBgColor=255,255,150 CurrentRangeBgColor=220,220,100
Diff3AlignBC=1 CurrentRangeDiffBgColor=255,255,150
DiffBgColor=224,224,224 Diff3AlignBC=true
DirAntiPattern=CVS;.deps;.svn;.hg;.git DiffBgColor=224,224,224
EncodingForA=System DirAntiPattern=CVS;.deps;.svn;.hg;.git
EncodingForB=System EncodingForA=UTF-8
EncodingForC=System EncodingForB=UTF-8
EncodingForOutput=System EncodingForC=UTF-8
EncodingForPP=System EncodingForOutput=UTF-8
EscapeKeyQuits=0 EncodingForPP=UTF-8
FgColor=0,0,0 EscapeKeyQuits=false
FileAntiPattern=*.orig;*.o;*.obj;*.rej;*.bak FgColor=0,0,0
FilePattern=* FileAntiPattern=*.orig;*.o;*.obj;*.rej;*.bak
FindHidden=1 FilePattern=*
FollowDirLinks=0 FindHidden=true
FollowFileLinks=0 FollowDirLinks=false
Font=Courier New,10,normal FollowFileLinks=false
FullAnalysis=1 Font=Monospace,9,-1,5,50,0,0,0,0,0
Geometry=600,400 FullAnalysis=true
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+(.*) Geometry=600,400
HistoryEntryStartSortKeyOrder=4,3,2,5,1,6 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+(.*)
HistoryMergeSorting=0 HistoryEntryStartSortKeyOrder=4\\,3\\,2\\,5\\,1\\,6
HistoryStartRegExp=.*\\$Log.*\\$.* HistoryMergeSorting=false
HorizDiffWindowSplitting=1 HistoryStartRegExp=.*\\\\$Log.*\\\\$.*
IgnorableCmdLineOptions=-u;-query;-html;-abort HorizDiffWindowSplitting=true
IgnoreCase=0 IgnorableCmdLineOptions=-u;-query;-html;-abort
IgnoreComments=0 IgnoreCase=false
IgnoreNumbers=0 IgnoreComments=false
IrrelevantMergeCmd= IgnoreNumbers=false
ItalicForDeltas=0 IrrelevantMergeCmd=\\0
Language=Auto ItalicForDeltas=false
LineEndStyle=2 LineEndStyle=2
LineMatchingPreProcessorCmd= LineMatchingPreProcessorCmd=\\0
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=\\0
RecentAFiles= RecentAFiles=
RecentBFiles= RecentBFiles=
RecentCFiles= RecentCFiles=
RecentEncodings= RecentEncodings=
RecentOutputFiles= RecentOutputFiles=
RecursiveDirs=1 RecursiveDirs=true
ReplaceTabs=1 ReplaceTabs=true
RightToLeftLanguage=0 RightToLeftLanguage=false
RunHistoryAutoMergeOnMergeStart=0 RunHistoryAutoMergeOnMergeStart=false
RunRegExpAutoMergeOnMergeStart=0 RunRegExpAutoMergeOnMergeStart=false
SameEncoding=1 SameEncoding=true
Show Statusbar=1 Show Statusbar=true
Show Toolbar=1 Show Toolbar=true
ShowIdenticalFiles=0 ShowIdenticalFiles=true
ShowInfoDialogs=1 ShowInfoDialogs=true
ShowLineNumbers=0 ShowLineNumbers=false
ShowWhiteSpace=1 ShowWhiteSpace=true
ShowWhiteSpaceCharacters=1 ShowWhiteSpaceCharacters=true
SkipDirStatus=0 SkipDirStatus=true
SyncMode=0 SyncMode=false
TabSize=4 TabSize=4
TrustDate=0 TrustDate=false
TrustDateFallbackToBinary=0 TrustDateFallbackToBinary=false
TrustSize=0 TrustSize=false
TryHard=1 TryHard=true
UnfoldSubdirs=1 UnfoldSubdirs=true
UseCvsIgnore=0 UseCvsIgnore=false
WhiteSpace2FileMergeDefault=0 WhiteSpace2FileMergeDefault=0
WhiteSpace3FileMergeDefault=0 WhiteSpace3FileMergeDefault=0
WhiteSpaceEqual=1 WhiteSpaceEqual=true
WindowStateMaximised=1 WindowStateMaximised=true
WordWrap=0 WordWrap=false
[MainWindow]
Height 768=769
State=AAAA/wAAAAD9AAAAAAAABVYAAAJaAAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAEAAAAWAG0AYQBpAG4AVABvAG8AbABCAGEAcgEAAAAA/////wAAAAAAAAAA
ToolBarsMovable=Disabled
Width 1366=1367

2
common/configure_fresh_system
View file

@ -21,6 +21,8 @@ ln -vfs "$DIR/.zshrc" ~/.
ln -vfs "$DIR/.oh-my-zsh" ~/. ln -vfs "$DIR/.oh-my-zsh" ~/.
ln -vfs "$DIR/.Slic3r" ~/. ln -vfs "$DIR/.Slic3r" ~/.
ln -vfs "$DIR/.ghci" ~/. ln -vfs "$DIR/.ghci" ~/.
mkdir -p ~/.kde/share/config/
ln -vfs "$DIR/.kdiff3rc" ~/.kde/share/config/kdiff3rc
ln -vfs "$DIR/.gitconfig.linux.private" ~/.gitconfig ln -vfs "$DIR/.gitconfig.linux.private" ~/.gitconfig
ln -vfs "$DIR/tools" ~/ ln -vfs "$DIR/tools" ~/