As requested by solar, never show a merge list unless it's explicitly requested by...
authorZac Medico <zmedico@gentoo.org>
Fri, 23 Feb 2007 23:39:28 +0000 (23:39 -0000)
committerZac Medico <zmedico@gentoo.org>
Fri, 23 Feb 2007 23:39:28 +0000 (23:39 -0000)
commit544273b5584d139b62ad464eed96e844e33a990d
tree812a7e9eef4ea5516667feb173fde77d2868453a
parentcf8c2092beef7260b0ac33ec123cda81c72e89f5
As requested by solar, never show a merge list unless it's explicitly requested by --ask, --pretend, or --tree.

svn path=/main/trunk/; revision=6062
pym/emerge/__init__.py