diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-11-29 06:37:31 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-11-29 06:37:31 +0000 |
| commit | 7732edee1af982c52d61f2fd972536e405b8933e (patch) | |
| tree | 4d1ce8cf5b5de1ef04d57a7827c66452519aa04a | |
| parent | fcfc91fc87a68c760d3df3e41b1056311c5b6d0e (diff) | |
| download | portage-7732edee1af982c52d61f2fd972536e405b8933e.tar.gz portage-7732edee1af982c52d61f2fd972536e405b8933e.tar.bz2 portage-7732edee1af982c52d61f2fd972536e405b8933e.zip | |
Add 'automatically resolved' blockers to the --pretend docs.
svn path=/main/trunk/; revision=12120
| -rw-r--r-- | man/emerge.1 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/man/emerge.1 b/man/emerge.1 index 61506f171..f113ebd3b 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -405,7 +405,8 @@ R replacing (remerging same version)) F fetch restricted (must be manually downloaded) f fetch restricted (already downloaded) I interactive (requires user input) -B blocked by an already installed package +B blocked by another package (unresolved conflict) +b blocked by another package (automatically resolved conflict) .TE .TP .BR "\-\-quiet " (\fB\-q\fR) |