From: Zac Medico Date: Tue, 24 Feb 2009 23:16:42 +0000 (-0000) Subject: Bug #259882 - Disable the ignore-previously-merged option by default since X-Git-Tag: v2.2_rc24~110 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=356acce97b8ae68cf58e814da7ca06bad45fcd4a;p=portage.git Bug #259882 - Disable the ignore-previously-merged option by default since emerge's confmem already provides similar functionality which is a little safer. svn path=/main/trunk/; revision=12705 --- 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