Redo "revert" using three-way merge machinery.