projects
/
portage.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fcfc91f
)
Add 'automatically resolved' blockers to the --pretend docs.
author
Zac Medico
<zmedico@gentoo.org>
Sat, 29 Nov 2008 06:37:31 +0000
(06:37 -0000)
committer
Zac Medico
<zmedico@gentoo.org>
Sat, 29 Nov 2008 06:37:31 +0000
(06:37 -0000)
svn path=/main/trunk/; revision=12120
man/emerge.1
patch
|
blob
|
history
diff --git
a/man/emerge.1
b/man/emerge.1
index 61506f1718820a3fa7d721ca58743d6a8b3b9a65..f113ebd3b59bc417b519e156b4c5a62b3c4a3e65 100644
(file)
--- 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)