git-read-tree: simplify merge loops enormously