merge-recursive: don't segfault while handling rename clashes