Allow the merge task to continue despite conflicts when --fetch-all-uri is specified...
authorZac Medico <zmedico@gentoo.org>
Sat, 24 Mar 2007 21:39:36 +0000 (21:39 -0000)
committerZac Medico <zmedico@gentoo.org>
Sat, 24 Mar 2007 21:39:36 +0000 (21:39 -0000)
commit6a034713fb2ff9aa5be2349d001ce15161c50c60
treec5e82e7c9ec0675f0c38c1e54cccafaf773be10e
parentd29935b7920208a7e5428d956d24f4ea5211ae2b
Allow the merge task to continue despite conflicts when --fetch-all-uri is specified. (trunk r6272:6273)

svn path=/main/branches/2.1.2/; revision=6274
bin/emerge