merge-recursive: ensure we write updates for directory-renamed file