From bf43291a51dd432a831563d50c17ea38c3346180 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 11 Mar 2009 06:17:54 +0000 Subject: [PATCH] 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 --- cnf/dispatch-conf.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cnf/dispatch-conf.conf b/cnf/dispatch-conf.conf index d9ccc12a6..4fed03282 100644 --- 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 -- 2.26.2