From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 29 Nov 2008 06:39:43 +0000 (-0000)
Subject: Add 'automatically resolved' blockers to the --pretend docs. (trunk r12120)
X-Git-Tag: v2.1.6_rc3~16
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=22251bfd49f7ded6c97c5dc38a68932905c71481;p=portage.git

Add 'automatically resolved' blockers to the --pretend docs. (trunk r12120)

svn path=/main/branches/2.1.6/; revision=12121
---

diff --git a/man/emerge.1 b/man/emerge.1
index e4a3842c4..1a28365ab 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -402,7 +402,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)