Home
last modified time | relevance | path

Searched refs:MERGE_SIDE2 (Results 1 – 5 of 5) sorted by relevance

/dports/devel/git-svn/git-2.34.1/
H A Dmerge-ort.c55 MERGE_SIDE2 = 2 enumerator
541 for (i = MERGE_SIDE1; i <= MERGE_SIDE2; ++i) { in clear_or_reinit_internal_opts()
557 for (i = MERGE_SIDE1; i <= MERGE_SIDE2; ++i) { in clear_or_reinit_internal_opts()
824 for (i = MERGE_BASE; i <= MERGE_SIDE2; i++) { in setup_path_info()
1197 side = side1_matches_mbase ? MERGE_SIDE2 : in collect_merge_info_callback()
1235 for (i = MERGE_BASE; i <= MERGE_SIDE2; i++) { in collect_merge_info_callback()
1262 for (i = MERGE_BASE; i <= MERGE_SIDE2; i++) in collect_merge_info_callback()
1409 for (i = MERGE_BASE; i <= MERGE_SIDE2; i++) in handle_deferred_entries()
3119 for (s = MERGE_SIDE1; s <= MERGE_SIDE2; s++) { in detect_and_process_renames()
3132 for (s = MERGE_SIDE1; s <= MERGE_SIDE2; s++) { in detect_and_process_renames()
[all …]
/dports/devel/git-gui/git-2.34.1/
H A Dmerge-ort.c55 MERGE_SIDE2 = 2 enumerator
541 for (i = MERGE_SIDE1; i <= MERGE_SIDE2; ++i) { in clear_or_reinit_internal_opts()
557 for (i = MERGE_SIDE1; i <= MERGE_SIDE2; ++i) { in clear_or_reinit_internal_opts()
824 for (i = MERGE_BASE; i <= MERGE_SIDE2; i++) { in setup_path_info()
1197 side = side1_matches_mbase ? MERGE_SIDE2 : in collect_merge_info_callback()
1235 for (i = MERGE_BASE; i <= MERGE_SIDE2; i++) { in collect_merge_info_callback()
1262 for (i = MERGE_BASE; i <= MERGE_SIDE2; i++) in collect_merge_info_callback()
1409 for (i = MERGE_BASE; i <= MERGE_SIDE2; i++) in handle_deferred_entries()
3119 for (s = MERGE_SIDE1; s <= MERGE_SIDE2; s++) { in detect_and_process_renames()
3132 for (s = MERGE_SIDE1; s <= MERGE_SIDE2; s++) { in detect_and_process_renames()
[all …]
/dports/devel/git-p4/git-2.34.1/
H A Dmerge-ort.c55 MERGE_SIDE2 = 2 enumerator
541 for (i = MERGE_SIDE1; i <= MERGE_SIDE2; ++i) { in clear_or_reinit_internal_opts()
557 for (i = MERGE_SIDE1; i <= MERGE_SIDE2; ++i) { in clear_or_reinit_internal_opts()
824 for (i = MERGE_BASE; i <= MERGE_SIDE2; i++) { in setup_path_info()
1197 side = side1_matches_mbase ? MERGE_SIDE2 : in collect_merge_info_callback()
1235 for (i = MERGE_BASE; i <= MERGE_SIDE2; i++) { in collect_merge_info_callback()
1262 for (i = MERGE_BASE; i <= MERGE_SIDE2; i++) in collect_merge_info_callback()
1409 for (i = MERGE_BASE; i <= MERGE_SIDE2; i++) in handle_deferred_entries()
3119 for (s = MERGE_SIDE1; s <= MERGE_SIDE2; s++) { in detect_and_process_renames()
3132 for (s = MERGE_SIDE1; s <= MERGE_SIDE2; s++) { in detect_and_process_renames()
[all …]
/dports/devel/git/git-2.34.1/
H A Dmerge-ort.c55 MERGE_SIDE2 = 2 enumerator
541 for (i = MERGE_SIDE1; i <= MERGE_SIDE2; ++i) { in clear_or_reinit_internal_opts()
557 for (i = MERGE_SIDE1; i <= MERGE_SIDE2; ++i) { in clear_or_reinit_internal_opts()
824 for (i = MERGE_BASE; i <= MERGE_SIDE2; i++) { in setup_path_info()
1197 side = side1_matches_mbase ? MERGE_SIDE2 : in collect_merge_info_callback()
1235 for (i = MERGE_BASE; i <= MERGE_SIDE2; i++) { in collect_merge_info_callback()
1262 for (i = MERGE_BASE; i <= MERGE_SIDE2; i++) in collect_merge_info_callback()
1409 for (i = MERGE_BASE; i <= MERGE_SIDE2; i++) in handle_deferred_entries()
3119 for (s = MERGE_SIDE1; s <= MERGE_SIDE2; s++) { in detect_and_process_renames()
3132 for (s = MERGE_SIDE1; s <= MERGE_SIDE2; s++) { in detect_and_process_renames()
[all …]
/dports/devel/git-cvs/git-2.34.1/
H A Dmerge-ort.c55 MERGE_SIDE2 = 2 enumerator
541 for (i = MERGE_SIDE1; i <= MERGE_SIDE2; ++i) { in clear_or_reinit_internal_opts()
557 for (i = MERGE_SIDE1; i <= MERGE_SIDE2; ++i) { in clear_or_reinit_internal_opts()
824 for (i = MERGE_BASE; i <= MERGE_SIDE2; i++) { in setup_path_info()
1197 side = side1_matches_mbase ? MERGE_SIDE2 : in collect_merge_info_callback()
1235 for (i = MERGE_BASE; i <= MERGE_SIDE2; i++) { in collect_merge_info_callback()
1262 for (i = MERGE_BASE; i <= MERGE_SIDE2; i++) in collect_merge_info_callback()
1409 for (i = MERGE_BASE; i <= MERGE_SIDE2; i++) in handle_deferred_entries()
3119 for (s = MERGE_SIDE1; s <= MERGE_SIDE2; s++) { in detect_and_process_renames()
3132 for (s = MERGE_SIDE1; s <= MERGE_SIDE2; s++) { in detect_and_process_renames()
[all …]