rename_conflict_info   95 merge-recursive.c 	struct rename_conflict_info *rename_conflict_info;
rename_conflict_info  110 merge-recursive.c 	struct rename_conflict_info *ci = xcalloc(1, sizeof(struct rename_conflict_info));
rename_conflict_info  117 merge-recursive.c 	dst_entry1->rename_conflict_info = ci;
rename_conflict_info  124 merge-recursive.c 		dst_entry2->rename_conflict_info = ci;
rename_conflict_info 1120 merge-recursive.c 			struct rename_conflict_info *ci)
rename_conflict_info 1163 merge-recursive.c 					struct rename_conflict_info *ci)
rename_conflict_info 1218 merge-recursive.c 					struct rename_conflict_info *ci)
rename_conflict_info 1587 merge-recursive.c 			 struct rename_conflict_info *rename_conflict_info)
rename_conflict_info 1607 merge-recursive.c 	if (rename_conflict_info) {
rename_conflict_info 1608 merge-recursive.c 		struct diff_filepair *pair1 = rename_conflict_info->pair1;
rename_conflict_info 1610 merge-recursive.c 		path1 = (o->branch1 == rename_conflict_info->branch1) ?
rename_conflict_info 1616 merge-recursive.c 		path2 = (rename_conflict_info->pair2 ||
rename_conflict_info 1617 merge-recursive.c 			 o->branch2 == rename_conflict_info->branch1) ?
rename_conflict_info 1651 merge-recursive.c 		if (rename_conflict_info && !df_conflict_remains)
rename_conflict_info 1674 merge-recursive.c 		new_path = unique_path(o, path, rename_conflict_info->branch1);
rename_conflict_info 1700 merge-recursive.c 	if (entry->rename_conflict_info) {
rename_conflict_info 1701 merge-recursive.c 		struct rename_conflict_info *conflict_info = entry->rename_conflict_info;