Allow the merge task to continue despite conflicts when --fetch-all-uri is specified.
authorZac Medico <zmedico@gentoo.org>
Sat, 24 Mar 2007 21:38:35 +0000 (21:38 -0000)
committerZac Medico <zmedico@gentoo.org>
Sat, 24 Mar 2007 21:38:35 +0000 (21:38 -0000)
commit6fef0444c727b18e9a768187e2c96a2db428d1c8
treec0218779197f91f4e557d4942dfacc76dab33643
parentc500d95c62811ae0c73b47806225fd5cafca835f
Allow the merge task to continue despite conflicts when --fetch-all-uri is specified.

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