commit: 9ac8c8b9062b316d266f8a5ed678143eee9d2d1e Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Thu Jun 22 08:46:28 2023 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Thu Jun 22 08:47:08 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=9ac8c8b9
Merge remote-tracking branch 'origin/master' into prefix Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> NEWS | 4 +--- lib/_emerge/depgraph.py | 4 +++- lib/portage/tests/resolver/test_slot_conflict_blocked_prune.py | 2 +- ...st_unecessary_slot_upgrade.py => test_unnecessary_slot_upgrade.py} | 0 setup.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)
