git-merge: finish when git-read-tree fails