Make error messages from cherry-pick/revert more sensible