portage: install dev-util/icdiff
Merge remote-tracking branch 'origin/h10-gentoo' into h9-gentoo