From 485fd9f277fa2d9c0011e9bee8bab92ddbcbefbc Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 23 May 2007 10:43:38 +0000 Subject: Add a 'ignore-previously-merged' config option which gives similar behavior to the --noconfmem emerge option. svn path=/main/trunk/; revision=6592 --- cnf/dispatch-conf.conf | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'cnf/dispatch-conf.conf') 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 -- cgit v1.2.3-1-g7c22