Create portage._merge_encoding and a corresponding _os_merge wrapper that
authorZac Medico <zmedico@gentoo.org>
Thu, 13 Aug 2009 22:17:05 +0000 (22:17 -0000)
committerZac Medico <zmedico@gentoo.org>
Thu, 13 Aug 2009 22:17:05 +0000 (22:17 -0000)
commit19caf9be975b650c6778a28432ccb11a9c429f84
treea54bd5d0c8823a56e84817924230cc9d575d9e42
parent09e4e5ac8595257981aa91bff04c4ac4d0bb2138
Create portage._merge_encoding and a corresponding _os_merge wrapper that
will later be used for all the merge code.

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