Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix mismerge / failing reconfigurator-cli tests (#6864)
#6788 added expectorate tests of `reconfigurator-cli`, and #6836 changed behavior that affected those tests but not in a way that conflicted at the git level. This catches us up to both changes.
- Loading branch information