aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/%USERPROFILE%
diff options
context:
space:
mode:
Diffstat (limited to '%USERPROFILE%')
-rw-r--r--%USERPROFILE%/.kdiff3rc10
1 files changed, 5 insertions, 5 deletions
diff --git a/%USERPROFILE%/.kdiff3rc b/%USERPROFILE%/.kdiff3rc
index 15c8548..e923a8d 100644
--- a/%USERPROFILE%/.kdiff3rc
+++ b/%USERPROFILE%/.kdiff3rc
@@ -6,7 +6,7 @@ AutoDetectUnicodeB=1
AutoDetectUnicodeC=1
AutoIndentation=1
AutoMergeRegExp=.*\\$(Version\|Header\|Date\|Author).*\\$.*
-AutoSaveAndQuitOnMergeWithoutConflicts=0
+AutoSaveAndQuitOnMergeWithoutConflicts=1
AutoSelectOutEncoding=1
BgColor=255,255,255
BinaryComparison=1
@@ -21,7 +21,7 @@ CurrentRangeBgColor=220,220,100
CurrentRangeDiffBgColor=255,255,150
Diff3AlignBC=0
DiffBgColor=224,224,224
-DirAntiPattern=CVS;.deps;.svn;.hg;.git
+DirAntiPattern=.git;__pycache__
EncodingForA=System
EncodingForB=System
EncodingForC=System
@@ -29,7 +29,7 @@ EncodingForOutput=System
EncodingForPP=System
EscapeKeyQuits=0
FgColor=0,0,0
-FileAntiPattern=*.orig;*.o;*.obj;*.rej;*.bak
+FileAntiPattern=*.orig;*.bak
FilePattern=*
FindHidden=1
FollowDirLinks=0
@@ -73,8 +73,8 @@ SameEncoding=1
Show Statusbar=1
Show Toolbar=1
ShowIdenticalFiles=1
-ShowInfoDialogs=1
-ShowLineNumbers=0
+ShowInfoDialogs=0
+ShowLineNumbers=1
ShowWhiteSpace=1
ShowWhiteSpaceCharacters=1
SkipDirStatus=0