diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2007-05-23 20:52:25 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-05-23 20:52:25 +0000 |
| commit | 2737e9a8b5ee396f4a8dbe35a52c80764ff384d8 (patch) | |
| tree | c52389e7d0b5b41d8e8a88ba730fd4aa57087f24 /cnf | |
| parent | Punt the portdbapi.getsize() function since it's unused and broken (mysum ref... (diff) | |
| download | portage-2737e9a8b5ee396f4a8dbe35a52c80764ff384d8.tar.gz portage-2737e9a8b5ee396f4a8dbe35a52c80764ff384d8.tar.bz2 portage-2737e9a8b5ee396f4a8dbe35a52c80764ff384d8.zip | |
Add a 'ignore-previously-merged' config option which gives similar behavior to the --noconfmem emerge option. (trunk r6591:6592)
svn path=/main/branches/2.1.2/; revision=6608
Diffstat (limited to 'cnf')
| -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 |