git-read-tree: fix up two-way merge