2 Commits (24a5a0dacb7ccec131bce5c4c0289da4e90a5479)

Author	SHA1	Message	Date
Jordi Boggiano	189d5adab0	Fix reporting of replace conflicts to not mention provides	2020-01-30 17:13:12 +01:00
Jordi Boggiano	1d4cdb60d0	Improve error reporting for conflicts/replaces of various kinds, fixes #7254	2020-01-30 14:43:56 +01:00