diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2008-11-29 06:39:43 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-11-29 06:39:43 +0000 |
| commit | 22251bfd49f7ded6c97c5dc38a68932905c71481 (patch) | |
| tree | ed04f509033938dce1979b2db0eeb515c23e05c9 /man/emerge.1 | |
| parent | Use stat st_dev attributes instead of the older approach. (trunk r12117) (diff) | |
| download | portage-multirepo-22251bfd49f7ded6c97c5dc38a68932905c71481.tar.gz portage-multirepo-22251bfd49f7ded6c97c5dc38a68932905c71481.tar.bz2 portage-multirepo-22251bfd49f7ded6c97c5dc38a68932905c71481.zip | |
Add 'automatically resolved' blockers to the --pretend docs. (trunk r12120)
svn path=/main/branches/2.1.6/; revision=12121
Diffstat (limited to 'man/emerge.1')
| -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 e4a3842c..1a28365a 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) |