git-read-tree: fix up three-way merge tests