summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-08-02 00:32:51 +0000
committerZac Medico <zmedico@gentoo.org>2008-08-02 00:32:51 +0000
commit81d742d9b63b8a6305482d78c01274be69db5c3f (patch)
tree61492c1a74bfcb170b1aefdd23f54afda2d4f658 /doc
parent705ef026a8ffd0528de58ac4da7889022bee9741 (diff)
downloadportage-81d742d9b63b8a6305482d78c01274be69db5c3f.tar.gz
portage-81d742d9b63b8a6305482d78c01274be69db5c3f.tar.bz2
portage-81d742d9b63b8a6305482d78c01274be69db5c3f.zip
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
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions