diff options
author | Zac Medico <zmedico@gentoo.org> | 2007-03-24 21:38:35 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2007-03-24 21:38:35 +0000 |
commit | 6fef0444c727b18e9a768187e2c96a2db428d1c8 (patch) | |
tree | c0218779197f91f4e557d4942dfacc76dab33643 /bin/emake | |
parent | c500d95c62811ae0c73b47806225fd5cafca835f (diff) | |
download | portage-6fef0444c727b18e9a768187e2c96a2db428d1c8.tar.gz portage-6fef0444c727b18e9a768187e2c96a2db428d1c8.tar.bz2 portage-6fef0444c727b18e9a768187e2c96a2db428d1c8.zip |
Allow the merge task to continue despite conflicts when --fetch-all-uri is specified.
svn path=/main/trunk/; revision=6273
Diffstat (limited to 'bin/emake')
0 files changed, 0 insertions, 0 deletions