aboutsummaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2013-09-24 19:29:10 +0200
committerFabian Groffen <grobian@gentoo.org>2013-09-24 19:29:10 +0200
commit2e0635e2668a82203530442feaeeaab5cf9abf46 (patch)
treefb482071f0e2aa31cef6c9a32fb703fe8f2c64f2 /man
parentMerge remote-tracking branch 'overlays-gentoo-org/master' into prefix (diff)
parentRepoConfigLoader: Fix indent (diff)
downloadportage-2e0635e2668a82203530442feaeeaab5cf9abf46.tar.gz
portage-2e0635e2668a82203530442feaeeaab5cf9abf46.tar.bz2
portage-2e0635e2668a82203530442feaeeaab5cf9abf46.zip
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
Conflicts: README
Diffstat (limited to 'man')
-rw-r--r--man/emerge.14
1 files changed, 4 insertions, 0 deletions
diff --git a/man/emerge.1 b/man/emerge.1
index 4b402fb4b..78513af63 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -846,6 +846,10 @@ Symbol Location Meaning
{} circumfix state is bound to FEATURES settings
.TE
.TP
+.BR "\-\-verbose\-conflicts"
+Make slot conflicts more verbose. Note that this may in some cases output
+hundreds of packages for slot conflicts.
+.TP
.BR "\-\-verbose\-main\-repo\-display"
In the package merge list display, print ::repository even for main repository.
.TP