diff options
author | Zac Medico <zmedico@gentoo.org> | 2007-03-24 21:39:36 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2007-03-24 21:39:36 +0000 |
commit | 6a034713fb2ff9aa5be2349d001ce15161c50c60 (patch) | |
tree | c5e82e7c9ec0675f0c38c1e54cccafaf773be10e /src | |
parent | d29935b7920208a7e5428d956d24f4ea5211ae2b (diff) | |
download | portage-6a034713fb2ff9aa5be2349d001ce15161c50c60.tar.gz portage-6a034713fb2ff9aa5be2349d001ce15161c50c60.tar.bz2 portage-6a034713fb2ff9aa5be2349d001ce15161c50c60.zip |
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
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions