Only try to merge portage asap when the new version is different.

svn path=/main/trunk/; revision=15813
1 file changed