In the file collision elog message, only say 'NOT merged' when
authorZac Medico <zmedico@gentoo.org>
Sat, 2 Aug 2008 00:32:51 +0000 (00:32 -0000)
committerZac Medico <zmedico@gentoo.org>
Sat, 2 Aug 2008 00:32:51 +0000 (00:32 -0000)
commit81d742d9b63b8a6305482d78c01274be69db5c3f
tree61492c1a74bfcb170b1aefdd23f54afda2d4f658
parent705ef026a8ffd0528de58ac4da7889022bee9741
In the file collision elog message, only say 'NOT merged' when
collision-protect is enabled. Thanks to dberkholz for reporting.

svn path=/main/trunk/; revision=11316
pym/portage/dbapi/vartree.py