diff options
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 |