summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-11-29 06:37:31 +0000
committerZac Medico <zmedico@gentoo.org>2008-11-29 06:37:31 +0000
commit7732edee1af982c52d61f2fd972536e405b8933e (patch)
tree4d1ce8cf5b5de1ef04d57a7827c66452519aa04a /man
parentUse stat st_dev attributes instead of the older approach. (diff)
downloadportage-multirepo-7732edee1af982c52d61f2fd972536e405b8933e.tar.gz
portage-multirepo-7732edee1af982c52d61f2fd972536e405b8933e.tar.bz2
portage-multirepo-7732edee1af982c52d61f2fd972536e405b8933e.zip
Add 'automatically resolved' blockers to the --pretend docs.
svn path=/main/trunk/; revision=12120
Diffstat (limited to 'man')
-rw-r--r--man/emerge.13
1 files changed, 2 insertions, 1 deletions
diff --git a/man/emerge.1 b/man/emerge.1
index 61506f17..f113ebd3 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)