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

Authored by martinvonz on Mon, Dec 3, 5:10 PM.