diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-04-30 11:00:58 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-04-30 11:00:58 +0000 |
| commit | 5dd0999bb15312b4d1ea2c5fb44d652364299eca (patch) | |
| tree | 2e7b4462c1488ed1cad04e9f6b531a78d3d8e0cf /pym/emergehelp.py | |
| parent | 157c2f4615a60c60188f3f62bb76cad7fda0981a (diff) | |
| download | portage-5dd0999bb15312b4d1ea2c5fb44d652364299eca.tar.gz portage-5dd0999bb15312b4d1ea2c5fb44d652364299eca.tar.bz2 portage-5dd0999bb15312b4d1ea2c5fb44d652364299eca.zip | |
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
Diffstat (limited to 'pym/emergehelp.py')
| -rw-r--r-- | pym/emergehelp.py | 5 |
1 files changed, 3 insertions, 2 deletions
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 |