Home
last modified time | relevance | path

Searched refs:threeway_stage (Results 1 – 12 of 12) sorted by relevance

/dports/devel/git-svn/git-2.34.1/
H A Dapply.h152 struct object_id threeway_stage[3]; member
H A Dapply.c3635 oidclr(&patch->threeway_stage[0]); in try_threeway()
3637 oidcpy(&patch->threeway_stage[0], &pre_oid); in try_threeway()
3638 oidcpy(&patch->threeway_stage[1], &our_oid); in try_threeway()
3639 oidcpy(&patch->threeway_stage[2], &post_oid); in try_threeway()
4490 if (is_null_oid(&patch->threeway_stage[stage - 1])) in add_conflicted_stages_file()
4497 oidcpy(&ce->oid, &patch->threeway_stage[stage - 1]); in add_conflicted_stages_file()
/dports/devel/git-p4/git-2.34.1/
H A Dapply.h152 struct object_id threeway_stage[3]; member
H A Dapply.c3635 oidclr(&patch->threeway_stage[0]); in try_threeway()
3637 oidcpy(&patch->threeway_stage[0], &pre_oid); in try_threeway()
3638 oidcpy(&patch->threeway_stage[1], &our_oid); in try_threeway()
3639 oidcpy(&patch->threeway_stage[2], &post_oid); in try_threeway()
4490 if (is_null_oid(&patch->threeway_stage[stage - 1])) in add_conflicted_stages_file()
4497 oidcpy(&ce->oid, &patch->threeway_stage[stage - 1]); in add_conflicted_stages_file()
/dports/devel/git/git-2.34.1/
H A Dapply.h152 struct object_id threeway_stage[3]; member
H A Dapply.c3635 oidclr(&patch->threeway_stage[0]); in try_threeway()
3637 oidcpy(&patch->threeway_stage[0], &pre_oid); in try_threeway()
3638 oidcpy(&patch->threeway_stage[1], &our_oid); in try_threeway()
3639 oidcpy(&patch->threeway_stage[2], &post_oid); in try_threeway()
4490 if (is_null_oid(&patch->threeway_stage[stage - 1])) in add_conflicted_stages_file()
4497 oidcpy(&ce->oid, &patch->threeway_stage[stage - 1]); in add_conflicted_stages_file()
/dports/devel/git-gui/git-2.34.1/
H A Dapply.h152 struct object_id threeway_stage[3]; member
H A Dapply.c3635 oidclr(&patch->threeway_stage[0]); in try_threeway()
3637 oidcpy(&patch->threeway_stage[0], &pre_oid); in try_threeway()
3638 oidcpy(&patch->threeway_stage[1], &our_oid); in try_threeway()
3639 oidcpy(&patch->threeway_stage[2], &post_oid); in try_threeway()
4490 if (is_null_oid(&patch->threeway_stage[stage - 1])) in add_conflicted_stages_file()
4497 oidcpy(&ce->oid, &patch->threeway_stage[stage - 1]); in add_conflicted_stages_file()
/dports/devel/git-cvs/git-2.34.1/
H A Dapply.h152 struct object_id threeway_stage[3]; member
H A Dapply.c3635 oidclr(&patch->threeway_stage[0]); in try_threeway()
3637 oidcpy(&patch->threeway_stage[0], &pre_oid); in try_threeway()
3638 oidcpy(&patch->threeway_stage[1], &our_oid); in try_threeway()
3639 oidcpy(&patch->threeway_stage[2], &post_oid); in try_threeway()
4490 if (is_null_oid(&patch->threeway_stage[stage - 1])) in add_conflicted_stages_file()
4497 oidcpy(&ce->oid, &patch->threeway_stage[stage - 1]); in add_conflicted_stages_file()
/dports/devel/cgit/cgit-1.2.3/git/
H A Dapply.h152 struct object_id threeway_stage[3]; member
H A Dapply.c3612 oidclr(&patch->threeway_stage[0]); in try_threeway()
3614 oidcpy(&patch->threeway_stage[0], &pre_oid); in try_threeway()
3615 oidcpy(&patch->threeway_stage[1], &our_oid); in try_threeway()
3616 oidcpy(&patch->threeway_stage[2], &post_oid); in try_threeway()
4449 if (is_null_oid(&patch->threeway_stage[stage - 1])) in add_conflicted_stages_file()
4456 oidcpy(&ce->oid, &patch->threeway_stage[stage - 1]); in add_conflicted_stages_file()