Searched refs:side2_dir_renames (Results 1 – 5 of 5) sorted by relevance
| /dports/devel/git-svn/git-2.34.1/ |
| H A D | merge-ort.c | 2127 struct strmap *side2_dir_renames = &renames->dir_renames[MERGE_SIDE2]; in handle_directory_level_conflicts() local
2131 if (strmap_contains(side2_dir_renames, entry->key)) in handle_directory_level_conflicts()
2137 strmap_remove(side2_dir_renames, duplicated.items[i].string, 0); in handle_directory_level_conflicts()
|
| /dports/devel/git-gui/git-2.34.1/ |
| H A D | merge-ort.c | 2127 struct strmap *side2_dir_renames = &renames->dir_renames[MERGE_SIDE2]; in handle_directory_level_conflicts() local
2131 if (strmap_contains(side2_dir_renames, entry->key)) in handle_directory_level_conflicts()
2137 strmap_remove(side2_dir_renames, duplicated.items[i].string, 0); in handle_directory_level_conflicts()
|
| /dports/devel/git-p4/git-2.34.1/ |
| H A D | merge-ort.c | 2127 struct strmap *side2_dir_renames = &renames->dir_renames[MERGE_SIDE2]; in handle_directory_level_conflicts() local
2131 if (strmap_contains(side2_dir_renames, entry->key)) in handle_directory_level_conflicts()
2137 strmap_remove(side2_dir_renames, duplicated.items[i].string, 0); in handle_directory_level_conflicts()
|
| /dports/devel/git/git-2.34.1/ |
| H A D | merge-ort.c | 2127 struct strmap *side2_dir_renames = &renames->dir_renames[MERGE_SIDE2]; in handle_directory_level_conflicts() local
2131 if (strmap_contains(side2_dir_renames, entry->key)) in handle_directory_level_conflicts()
2137 strmap_remove(side2_dir_renames, duplicated.items[i].string, 0); in handle_directory_level_conflicts()
|
| /dports/devel/git-cvs/git-2.34.1/ |
| H A D | merge-ort.c | 2127 struct strmap *side2_dir_renames = &renames->dir_renames[MERGE_SIDE2]; in handle_directory_level_conflicts() local
2131 if (strmap_contains(side2_dir_renames, entry->key)) in handle_directory_level_conflicts()
2137 strmap_remove(side2_dir_renames, duplicated.items[i].string, 0); in handle_directory_level_conflicts()
|