More work on merging with git-read-tree..