For bug #8423, allow the merge phase to overwrite untouched config files and also...
authorZac Medico <zmedico@gentoo.org>
Sun, 26 Nov 2006 09:03:54 +0000 (09:03 -0000)
committerZac Medico <zmedico@gentoo.org>
Sun, 26 Nov 2006 09:03:54 +0000 (09:03 -0000)
commit90d293a7f4c041fe01b68227d5c864ca5263de57
tree67c2172d144de859dc3e48a405aa669662a027d9
parent0d71298654f261e00ca7e65818bf099d4efc4a1d
For bug #8423, allow the merge phase to overwrite untouched config files and also allow the unmerge phase to unmerge untouched config files.

svn path=/main/trunk/; revision=5129
pym/portage.py