diff options
| -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 d9ccc12a..4fed0328 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 |