| /dports/devel/interactive_rebase_tool/git-interactive-rebase-tool-1.2.1/cargo-crates/libgit2-sys-0.7.11/libgit2/src/ |
| H A D | merge.c | 68 git_merge_diff *prev_conflict;
627 const git_merge_diff *conflict) in merge_conflict_resolve_trivial()
1335 git_merge_diff *target, in merge_diff_mark_rename_conflict()
1479 git_merge_diff *entry; in merge_diff_list_count_candidates()
1606 git_merge_diff *conflict) in merge_diff_detect_df_conflict()
1635 git_merge_diff *conflict) in merge_diff_detect_type()
1697 git_merge_diff *conflict; in merge_diff_from_index_entries()
1723 git_merge_diff *conflict; in merge_diff_list_insert_conflict()
1922 git_merge_diff *conflict; in index_update_reuc()
1960 git_merge_diff *conflict; in index_from_diff_list()
[all …]
|
| H A D | merge.h | 126 } git_merge_diff; typedef
|
| /dports/devel/cargo-c/cargo-c-0.9.6+cargo-0.58/cargo-crates/libgit2-sys-0.12.26+1.3.0/libgit2/src/ |
| H A D | merge.c | 68 git_merge_diff *prev_conflict;
663 const git_merge_diff *conflict) in merge_conflict_resolve_trivial()
1377 git_merge_diff *target, in merge_diff_mark_rename_conflict()
1521 git_merge_diff *entry; in merge_diff_list_count_candidates()
1650 git_merge_diff *conflict) in merge_diff_detect_df_conflict()
1679 git_merge_diff *conflict) in merge_diff_detect_type()
1741 git_merge_diff *conflict; in merge_diff_from_index_entries()
1767 git_merge_diff *conflict; in merge_diff_list_insert_conflict()
1967 git_merge_diff *conflict; in index_update_reuc()
2005 git_merge_diff *conflict; in index_from_diff_list()
[all …]
|
| H A D | merge.h | 126 } git_merge_diff; typedef
|
| /dports/misc/broot/broot-1.7.0/cargo-crates/libgit2-sys-0.12.21+1.1.0/libgit2/src/ |
| H A D | merge.c | 68 git_merge_diff *prev_conflict;
653 const git_merge_diff *conflict) in merge_conflict_resolve_trivial()
1364 git_merge_diff *target, in merge_diff_mark_rename_conflict()
1508 git_merge_diff *entry; in merge_diff_list_count_candidates()
1636 git_merge_diff *conflict) in merge_diff_detect_df_conflict()
1665 git_merge_diff *conflict) in merge_diff_detect_type()
1727 git_merge_diff *conflict; in merge_diff_from_index_entries()
1753 git_merge_diff *conflict; in merge_diff_list_insert_conflict()
1953 git_merge_diff *conflict; in index_update_reuc()
1991 git_merge_diff *conflict; in index_from_diff_list()
[all …]
|
| H A D | merge.h | 126 } git_merge_diff; typedef
|
| /dports/devel/git-absorb/git-absorb-0.6.6/cargo-crates/libgit2-sys-0.12.13+1.0.1/libgit2/src/ |
| H A D | merge.c | 68 git_merge_diff *prev_conflict;
646 const git_merge_diff *conflict) in merge_conflict_resolve_trivial()
1349 git_merge_diff *target, in merge_diff_mark_rename_conflict()
1493 git_merge_diff *entry; in merge_diff_list_count_candidates()
1620 git_merge_diff *conflict) in merge_diff_detect_df_conflict()
1649 git_merge_diff *conflict) in merge_diff_detect_type()
1711 git_merge_diff *conflict; in merge_diff_from_index_entries()
1737 git_merge_diff *conflict; in merge_diff_list_insert_conflict()
1936 git_merge_diff *conflict; in index_update_reuc()
1974 git_merge_diff *conflict; in index_from_diff_list()
[all …]
|
| /dports/devel/R-cran-git2r/git2r/src/libgit2/src/ |
| H A D | merge.c | 68 git_merge_diff *prev_conflict;
627 const git_merge_diff *conflict) in merge_conflict_resolve_trivial()
1335 git_merge_diff *target, in merge_diff_mark_rename_conflict()
1479 git_merge_diff *entry; in merge_diff_list_count_candidates()
1606 git_merge_diff *conflict) in merge_diff_detect_df_conflict()
1635 git_merge_diff *conflict) in merge_diff_detect_type()
1697 git_merge_diff *conflict; in merge_diff_from_index_entries()
1723 git_merge_diff *conflict; in merge_diff_list_insert_conflict()
1922 git_merge_diff *conflict; in index_update_reuc()
1960 git_merge_diff *conflict; in index_from_diff_list()
[all …]
|
| /dports/devel/git-delta/delta-0.9.2/cargo-crates/libgit2-sys-0.12.24+1.3.0/libgit2/src/ |
| H A D | merge.c | 68 git_merge_diff *prev_conflict;
663 const git_merge_diff *conflict) in merge_conflict_resolve_trivial()
1377 git_merge_diff *target, in merge_diff_mark_rename_conflict()
1521 git_merge_diff *entry; in merge_diff_list_count_candidates()
1650 git_merge_diff *conflict) in merge_diff_detect_df_conflict()
1679 git_merge_diff *conflict) in merge_diff_detect_type()
1741 git_merge_diff *conflict; in merge_diff_from_index_entries()
1767 git_merge_diff *conflict; in merge_diff_list_insert_conflict()
1967 git_merge_diff *conflict; in index_update_reuc()
2005 git_merge_diff *conflict; in index_from_diff_list()
[all …]
|
| /dports/sysutils/vector/vector-0.10.0/cargo-crates/libgit2-sys-0.12.7+1.0.0/libgit2/src/ |
| H A D | merge.c | 68 git_merge_diff *prev_conflict;
646 const git_merge_diff *conflict) in merge_conflict_resolve_trivial()
1349 git_merge_diff *target, in merge_diff_mark_rename_conflict()
1493 git_merge_diff *entry; in merge_diff_list_count_candidates()
1620 git_merge_diff *conflict) in merge_diff_detect_df_conflict()
1649 git_merge_diff *conflict) in merge_diff_detect_type()
1711 git_merge_diff *conflict; in merge_diff_from_index_entries()
1737 git_merge_diff *conflict; in merge_diff_list_insert_conflict()
1936 git_merge_diff *conflict; in index_update_reuc()
1974 git_merge_diff *conflict; in index_from_diff_list()
[all …]
|
| /dports/security/cargo-audit/rustsec-cargo-audit-v0.15.2/cargo-audit/cargo-crates/libgit2-sys-0.12.23+1.2.0/libgit2/src/ |
| H A D | merge.c | 68 git_merge_diff *prev_conflict;
663 const git_merge_diff *conflict) in merge_conflict_resolve_trivial()
1374 git_merge_diff *target, in merge_diff_mark_rename_conflict()
1518 git_merge_diff *entry; in merge_diff_list_count_candidates()
1647 git_merge_diff *conflict) in merge_diff_detect_df_conflict()
1676 git_merge_diff *conflict) in merge_diff_detect_type()
1738 git_merge_diff *conflict; in merge_diff_from_index_entries()
1764 git_merge_diff *conflict; in merge_diff_list_insert_conflict()
1964 git_merge_diff *conflict; in index_update_reuc()
2002 git_merge_diff *conflict; in index_from_diff_list()
[all …]
|
| /dports/devel/tokei/tokei-12.1.2/cargo-crates/libgit2-sys-0.12.17+1.1.0/libgit2/src/ |
| H A D | merge.c | 68 git_merge_diff *prev_conflict;
653 const git_merge_diff *conflict) in merge_conflict_resolve_trivial()
1364 git_merge_diff *target, in merge_diff_mark_rename_conflict()
1508 git_merge_diff *entry; in merge_diff_list_count_candidates()
1636 git_merge_diff *conflict) in merge_diff_detect_df_conflict()
1665 git_merge_diff *conflict) in merge_diff_detect_type()
1727 git_merge_diff *conflict; in merge_diff_from_index_entries()
1753 git_merge_diff *conflict; in merge_diff_list_insert_conflict()
1953 git_merge_diff *conflict; in index_update_reuc()
1991 git_merge_diff *conflict; in index_from_diff_list()
[all …]
|
| /dports/devel/gbump/gbump-1.0.1/cargo-crates/libgit2-sys-0.9.1/libgit2/src/ |
| H A D | merge.c | 68 git_merge_diff *prev_conflict;
627 const git_merge_diff *conflict) in merge_conflict_resolve_trivial()
1327 git_merge_diff *target, in merge_diff_mark_rename_conflict()
1471 git_merge_diff *entry; in merge_diff_list_count_candidates()
1598 git_merge_diff *conflict) in merge_diff_detect_df_conflict()
1627 git_merge_diff *conflict) in merge_diff_detect_type()
1689 git_merge_diff *conflict; in merge_diff_from_index_entries()
1715 git_merge_diff *conflict; in merge_diff_list_insert_conflict()
1914 git_merge_diff *conflict; in index_update_reuc()
1952 git_merge_diff *conflict; in index_from_diff_list()
[all …]
|
| /dports/devel/libgit2/libgit2-1.3.0/src/ |
| H A D | merge.c | 68 git_merge_diff *prev_conflict;
663 const git_merge_diff *conflict) in merge_conflict_resolve_trivial()
1377 git_merge_diff *target, in merge_diff_mark_rename_conflict()
1521 git_merge_diff *entry; in merge_diff_list_count_candidates()
1650 git_merge_diff *conflict) in merge_diff_detect_df_conflict()
1679 git_merge_diff *conflict) in merge_diff_detect_type()
1741 git_merge_diff *conflict; in merge_diff_from_index_entries()
1767 git_merge_diff *conflict; in merge_diff_list_insert_conflict()
1967 git_merge_diff *conflict; in index_update_reuc()
2005 git_merge_diff *conflict; in index_from_diff_list()
[all …]
|
| /dports/devel/gitui/gitui-0.10.1/cargo-crates/libgit2-sys-0.12.12+1.0.1/libgit2/src/ |
| H A D | merge.c | 68 git_merge_diff *prev_conflict;
646 const git_merge_diff *conflict) in merge_conflict_resolve_trivial()
1349 git_merge_diff *target, in merge_diff_mark_rename_conflict()
1493 git_merge_diff *entry; in merge_diff_list_count_candidates()
1620 git_merge_diff *conflict) in merge_diff_detect_df_conflict()
1649 git_merge_diff *conflict) in merge_diff_detect_type()
1711 git_merge_diff *conflict; in merge_diff_from_index_entries()
1737 git_merge_diff *conflict; in merge_diff_list_insert_conflict()
1936 git_merge_diff *conflict; in index_update_reuc()
1974 git_merge_diff *conflict; in index_from_diff_list()
[all …]
|
| /dports/security/cargo-audit/rustsec-cargo-audit-v0.15.2/cargo-audit/cargo-crates/libgit2-sys-0.12.19+1.1.0/libgit2/src/ |
| H A D | merge.c | 68 git_merge_diff *prev_conflict;
653 const git_merge_diff *conflict) in merge_conflict_resolve_trivial()
1364 git_merge_diff *target, in merge_diff_mark_rename_conflict()
1508 git_merge_diff *entry; in merge_diff_list_count_candidates()
1636 git_merge_diff *conflict) in merge_diff_detect_df_conflict()
1665 git_merge_diff *conflict) in merge_diff_detect_type()
1727 git_merge_diff *conflict; in merge_diff_from_index_entries()
1753 git_merge_diff *conflict; in merge_diff_list_insert_conflict()
1953 git_merge_diff *conflict; in index_update_reuc()
1991 git_merge_diff *conflict; in index_from_diff_list()
[all …]
|
| /dports/devel/cargo-generate/cargo-generate-0.9.0/cargo-crates/libgit2-sys-0.12.22+1.1.0/libgit2/src/ |
| H A D | merge.c | 68 git_merge_diff *prev_conflict;
653 const git_merge_diff *conflict) in merge_conflict_resolve_trivial()
1364 git_merge_diff *target, in merge_diff_mark_rename_conflict()
1508 git_merge_diff *entry; in merge_diff_list_count_candidates()
1636 git_merge_diff *conflict) in merge_diff_detect_df_conflict()
1665 git_merge_diff *conflict) in merge_diff_detect_type()
1727 git_merge_diff *conflict; in merge_diff_from_index_entries()
1753 git_merge_diff *conflict; in merge_diff_list_insert_conflict()
1953 git_merge_diff *conflict; in index_update_reuc()
1991 git_merge_diff *conflict; in index_from_diff_list()
[all …]
|
| /dports/sysutils/onefetch/onefetch-2.10.2/cargo-crates/libgit2-sys-0.12.21+1.1.0/libgit2/src/ |
| H A D | merge.c | 68 git_merge_diff *prev_conflict;
653 const git_merge_diff *conflict) in merge_conflict_resolve_trivial()
1364 git_merge_diff *target, in merge_diff_mark_rename_conflict()
1508 git_merge_diff *entry; in merge_diff_list_count_candidates()
1636 git_merge_diff *conflict) in merge_diff_detect_df_conflict()
1665 git_merge_diff *conflict) in merge_diff_detect_type()
1727 git_merge_diff *conflict; in merge_diff_from_index_entries()
1753 git_merge_diff *conflict; in merge_diff_list_insert_conflict()
1953 git_merge_diff *conflict; in index_update_reuc()
1991 git_merge_diff *conflict; in index_from_diff_list()
[all …]
|
| /dports/devel/pijul/pijul-1.0.0.a55/cargo-crates/libgit2-sys-0.12.24+1.3.0/libgit2/src/ |
| H A D | merge.c | 68 git_merge_diff *prev_conflict;
663 const git_merge_diff *conflict) in merge_conflict_resolve_trivial()
1377 git_merge_diff *target, in merge_diff_mark_rename_conflict()
1521 git_merge_diff *entry; in merge_diff_list_count_candidates()
1650 git_merge_diff *conflict) in merge_diff_detect_df_conflict()
1679 git_merge_diff *conflict) in merge_diff_detect_type()
1741 git_merge_diff *conflict; in merge_diff_from_index_entries()
1767 git_merge_diff *conflict; in merge_diff_list_insert_conflict()
1967 git_merge_diff *conflict; in index_update_reuc()
2005 git_merge_diff *conflict; in index_from_diff_list()
[all …]
|
| /dports/textproc/mdbook-linkcheck/mdbook-linkcheck-0.7.6/cargo-crates/libgit2-sys-0.12.24+1.3.0/libgit2/src/ |
| H A D | merge.c | 68 git_merge_diff *prev_conflict;
663 const git_merge_diff *conflict) in merge_conflict_resolve_trivial()
1377 git_merge_diff *target, in merge_diff_mark_rename_conflict()
1521 git_merge_diff *entry; in merge_diff_list_count_candidates()
1650 git_merge_diff *conflict) in merge_diff_detect_df_conflict()
1679 git_merge_diff *conflict) in merge_diff_detect_type()
1741 git_merge_diff *conflict; in merge_diff_from_index_entries()
1767 git_merge_diff *conflict; in merge_diff_list_insert_conflict()
1967 git_merge_diff *conflict; in index_update_reuc()
2005 git_merge_diff *conflict; in index_from_diff_list()
[all …]
|
| /dports/lang/rust/rustc-1.58.1-src/vendor/libgit2-sys/libgit2/src/ |
| H A D | merge.c | 68 git_merge_diff *prev_conflict;
663 const git_merge_diff *conflict) in merge_conflict_resolve_trivial()
1377 git_merge_diff *target, in merge_diff_mark_rename_conflict()
1521 git_merge_diff *entry; in merge_diff_list_count_candidates()
1650 git_merge_diff *conflict) in merge_diff_detect_df_conflict()
1679 git_merge_diff *conflict) in merge_diff_detect_type()
1741 git_merge_diff *conflict; in merge_diff_from_index_entries()
1767 git_merge_diff *conflict; in merge_diff_list_insert_conflict()
1967 git_merge_diff *conflict; in index_update_reuc()
2005 git_merge_diff *conflict; in index_from_diff_list()
[all …]
|
| /dports/sysutils/exa/exa-0.10.1/cargo-crates/libgit2-sys-0.12.18+1.1.0/libgit2/src/ |
| H A D | merge.c | 68 git_merge_diff *prev_conflict;
653 const git_merge_diff *conflict) in merge_conflict_resolve_trivial()
1364 git_merge_diff *target, in merge_diff_mark_rename_conflict()
1508 git_merge_diff *entry; in merge_diff_list_count_candidates()
1636 git_merge_diff *conflict) in merge_diff_detect_df_conflict()
1665 git_merge_diff *conflict) in merge_diff_detect_type()
1727 git_merge_diff *conflict; in merge_diff_from_index_entries()
1753 git_merge_diff *conflict; in merge_diff_list_insert_conflict()
1953 git_merge_diff *conflict; in index_update_reuc()
1991 git_merge_diff *conflict; in index_from_diff_list()
[all …]
|
| /dports/textproc/bat/bat-0.18.3/cargo-crates/libgit2-sys-0.12.21+1.1.0/libgit2/src/ |
| H A D | merge.c | 68 git_merge_diff *prev_conflict;
653 const git_merge_diff *conflict) in merge_conflict_resolve_trivial()
1364 git_merge_diff *target, in merge_diff_mark_rename_conflict()
1508 git_merge_diff *entry; in merge_diff_list_count_candidates()
1636 git_merge_diff *conflict) in merge_diff_detect_df_conflict()
1665 git_merge_diff *conflict) in merge_diff_detect_type()
1727 git_merge_diff *conflict; in merge_diff_from_index_entries()
1753 git_merge_diff *conflict; in merge_diff_list_insert_conflict()
1953 git_merge_diff *conflict; in index_update_reuc()
1991 git_merge_diff *conflict; in index_from_diff_list()
[all …]
|
| /dports/devel/sentry-cli/sentry-cli-1.71.0/cargo-crates/libgit2-sys-0.12.23+1.2.0/libgit2/src/ |
| H A D | merge.c | 68 git_merge_diff *prev_conflict;
663 const git_merge_diff *conflict) in merge_conflict_resolve_trivial()
1374 git_merge_diff *target, in merge_diff_mark_rename_conflict()
1518 git_merge_diff *entry; in merge_diff_list_count_candidates()
1647 git_merge_diff *conflict) in merge_diff_detect_df_conflict()
1676 git_merge_diff *conflict) in merge_diff_detect_type()
1738 git_merge_diff *conflict; in merge_diff_from_index_entries()
1764 git_merge_diff *conflict; in merge_diff_list_insert_conflict()
1964 git_merge_diff *conflict; in index_update_reuc()
2002 git_merge_diff *conflict; in index_from_diff_list()
[all …]
|
| H A D | merge.h | 126 } git_merge_diff; typedef
|