diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2007-05-23 10:43:38 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-05-23 10:43:38 +0000 |
| commit | 485fd9f277fa2d9c0011e9bee8bab92ddbcbefbc (patch) | |
| tree | 6cd0fc6cefebf6effa3c4b315e899885da9cca81 /cnf/dispatch-conf.conf | |
| parent | Pass a temporary file name to the package phase in the environment variable P... (diff) | |
| download | portage-485fd9f277fa2d9c0011e9bee8bab92ddbcbefbc.tar.gz portage-485fd9f277fa2d9c0011e9bee8bab92ddbcbefbc.tar.bz2 portage-485fd9f277fa2d9c0011e9bee8bab92ddbcbefbc.zip | |
Add a 'ignore-previously-merged' config option which gives similar behavior to the --noconfmem emerge option.
svn path=/main/trunk/; revision=6592
Diffstat (limited to 'cnf/dispatch-conf.conf')
| -rw-r--r-- | cnf/dispatch-conf.conf | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cnf/dispatch-conf.conf b/cnf/dispatch-conf.conf index b1ece73bb..d4caa9557 100644 --- a/cnf/dispatch-conf.conf +++ b/cnf/dispatch-conf.conf @@ -32,6 +32,11 @@ replace-wscomments=no # (yes or no) 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 +# (yes or no) +ignore-previously-merged=yes + # Per-session log file of changes made to configuration files #log-file=/var/log/dispatch-conf.log |