This is a fork of https://github.com/petertriho/cmp-git with a revert of a bug fix that appears to have introduced a bug.