From: frank <frank@bruni.home.brehm-online.com>
Date: Mon, 16 Jan 2012 06:08:16 +0000 (+0100)
Subject: committing changes in /etc after emerge run
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=83f1c25b3643ca6bfdeeef20f6c44d8215c09d27;p=config%2Fbruni%2Fetc.git

committing changes in /etc after emerge run

Package changes:
+app-misc/colordiff-1.0.9
---

diff --git a/.etckeeper b/.etckeeper
index c159d9cb..36c376b4 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -38,6 +38,8 @@ maybe chmod 0755 './bash_completion.d'
 maybe chmod 0755 './ca-certificates'
 maybe chmod 0644 './ca-certificates.conf'
 maybe chmod 0755 './ca-certificates/update.d'
+maybe chmod 0644 './colordiffrc'
+maybe chmod 0644 './colordiffrc-lightbg'
 maybe chmod 0755 './conf.d'
 maybe chmod 0644 './conf.d/bootmisc'
 maybe chmod 0644 './conf.d/consolefont'
diff --git a/colordiffrc b/colordiffrc
new file mode 100644
index 00000000..6e75b2b5
--- /dev/null
+++ b/colordiffrc
@@ -0,0 +1,26 @@
+# Example colordiffrc file for dark backgrounds
+#
+# Set banner=no to suppress authorship info at top of
+# colordiff output
+banner=no
+# By default, when colordiff output is being redirected
+# to a file, it detects this and does not colour-highlight
+# To make the patch file *include* colours, change the option
+# below to 'yes'
+color_patches=no
+# 
+# available colours are: white, yellow, green, blue,
+#                        cyan, red, magenta, black,
+#                        darkwhite, darkyellow, darkgreen,
+#                        darkblue, darkcyan, darkred,
+#                        darkmagenta, darkblack
+#
+# Can also specify 'none', 'normal' or 'off' which are all
+# aliases for the same thing, namely "don't colour highlight
+# this, use the default output colour"
+#
+plain=off
+newtext=blue
+oldtext=red
+diffstuff=magenta
+cvsstuff=green
diff --git a/colordiffrc-lightbg b/colordiffrc-lightbg
new file mode 100644
index 00000000..fe5333f4
--- /dev/null
+++ b/colordiffrc-lightbg
@@ -0,0 +1,26 @@
+# Example colordiffrc file for light backgrounds
+#
+# Set banner=no to suppress authorship info at top of
+# colordiff output
+banner=no
+# By default, when colordiff output is being redirected
+# to a file, it detects this and does not colour-highlight
+# To make the patch file *include* colours, change the option
+# below to 'yes'
+color_patches=no
+# 
+# available colours are: white, yellow, green, blue,
+#                        cyan, red, magenta, black,
+#                        darkwhite, darkyellow, darkgreen,
+#                        darkblue, darkcyan, darkred,
+#                        darkmagenta, darkblack
+#
+# Can also specify 'none', 'normal' or 'off' which are all
+# aliases for the same thing, namely "don't colour highlight
+# this, use the default output colour"
+#
+plain=off
+newtext=blue
+oldtext=red
+diffstuff=darkgreen
+cvsstuff=darkmagenta