rebase: fix dir/file conflict detection when using in-mem merge

Authored by martinvonz.