diff: Handle unmerged paths

Fixes gh-11