merge_recursive: Fix renames across paths below D/F conflicts