Optimize the two-way merge of git-read-tree too