3068
3068
existing_file, new_file = conflict[2], conflict[1]
3070
3070
existing_file, new_file = conflict[1], conflict[2]
3072
3072
tt.adjust_path(new_name, final_parent, existing_file)
3073
3073
new_conflicts.add((c_type, 'Moved existing file to',
3074
3074
existing_file, new_file))