diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-03-11 06:17:54 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-11 06:17:54 +0000 |
| commit | bf43291a51dd432a831563d50c17ea38c3346180 (patch) | |
| tree | 2b1d89fe877e24541ec00a1cd370604281191003 /cnf | |
| parent | 52ab3e9a9c8805c5a47ddbf22f3baaeb917a65f1 (diff) | |
| download | portage-bf43291a51dd432a831563d50c17ea38c3346180.tar.gz portage-bf43291a51dd432a831563d50c17ea38c3346180.tar.bz2 portage-bf43291a51dd432a831563d50c17ea38c3346180.zip | |
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
Diffstat (limited to 'cnf')
| -rw-r--r-- | cnf/dispatch-conf.conf | 4 |
1 files changed, 3 insertions, 1 deletions
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 |