setup_rename_conflict_info 1362 merge-recursive.c setup_rename_conflict_info(rename_type, setup_rename_conflict_info 1389 merge-recursive.c setup_rename_conflict_info(RENAME_TWO_FILES_TO_ONE, setup_rename_conflict_info 1429 merge-recursive.c setup_rename_conflict_info(RENAME_DELETE, setup_rename_conflict_info 1493 merge-recursive.c setup_rename_conflict_info(RENAME_NORMAL,