From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 29 Nov 2008 06:37:31 +0000 (-0000)
Subject: Add 'automatically resolved' blockers to the --pretend docs.
X-Git-Tag: v2.2_rc17~19
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7732edee1af982c52d61f2fd972536e405b8933e;p=portage.git

Add 'automatically resolved' blockers to the --pretend docs.

svn path=/main/trunk/; revision=12120
---

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)