Bug #259882 - Disable the ignore-previously-merged option by default since

emerge's confmem already provides similar functionality which is a little
safer. (trunk r12705)

svn path=/main/branches/2.1.6/; revision=12960

diff --git a/cnf/dispatch-conf.conf b/cnf/dispatch-conf.conf
index d9ccc12a62c854f4daf986483ff0f6d815164446..4fed03282f2651deebdc971cadcc205804de0d83 100644 (file)
--- a/cnf/dispatch-conf.conf
+++ b/cnf/dispatch-conf.conf
@@ -34,8 +34,10 @@ replace-unmodified=no
 
 # Ignore a version that is identical to the previously merged version,
 # even though it is different from the current user modified version
+# Note that emerge already has a similar feature enabled by default,
+# which can be disabled by the emerge --noconfmem option.
 # (yes or no)
-ignore-previously-merged=yes
+ignore-previously-merged=no
 
 # Per-session log file of changes made to configuration files
 #log-file=/var/log/dispatch-conf.log