Mirror of cursor/fix-merge-conflicts
Get conflicting code back to a buildable state.
Recent revisions are kept. Restoring one creates a new revision.
