The sound distributed version control system

Make tests compile

Removes conflict markers and re-adds dev dependencies exitcode and expectrl.

expectrl is updated to the latest version, which has some breaking API changes.

Created by  kim  on August 2, 2023
WQ2GJPJWZJ2GKYWCYRZ5AMDKGNTTT3IR2NA7JJZEZRUQRBSOXJYAC
Change contents