[PATCH] Teach diff-tree-helper to handle unmerged paths.