From 5dd0999bb15312b4d1ea2c5fb44d652364299eca Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 30 Apr 2006 11:00:58 +0000 Subject: Update portage config update messages to mention dispatch-conf (in addition to etc-update). Thanks to genstef for reporting this. svn path=/main/trunk/; revision=3283 --- pym/emergehelp.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pym/emergehelp.py') diff --git a/pym/emergehelp.py b/pym/emergehelp.py index 3b8c2d7bc..1abb497ab 100644 --- a/pym/emergehelp.py +++ b/pym/emergehelp.py @@ -376,8 +376,9 @@ add this to /etc/make.conf: CONFIG_PROTECT_MASK="/etc/wget /etc/rc.d" -etc-update is also available to aid in the merging of these files. It provides -a vimdiff interactive merging setup and can auto-merge trivial changes. +Tools such as dispatch-conf and etc-update are also available to aid in the +merging of these files. They provide interactive merging and can auto-merge +trivial changes. """ print outstuff -- cgit v1.2.3-1-g7c22