RENAME_NORMAL    1493 merge-recursive.c 				setup_rename_conflict_info(RENAME_NORMAL,
RENAME_NORMAL    1703 merge-recursive.c 		case RENAME_NORMAL: