| /dports/devel/interactive_rebase_tool/git-interactive-rebase-tool-1.2.1/cargo-crates/libgit2-sys-0.7.11/libgit2/src/ |
| H A D | diff_generate.c | 226 if (!git_index_entry_is_conflict(old_entry)) { in diff_delta__from_two()
235 if (!git_index_entry_is_conflict(new_entry)) { in diff_delta__from_two()
761 if (git_index_entry_is_conflict(oitem) || in maybe_modified()
762 git_index_entry_is_conflict(nitem)) { in maybe_modified()
922 !git_index_entry_is_conflict(prev_entry) || in iterator_advance()
923 !git_index_entry_is_conflict(*entry)) in iterator_advance()
983 if (git_index_entry_is_conflict(nitem)) in handle_unmatched_new_item()
1135 if (git_index_entry_is_conflict(info->oitem)) in handle_unmatched_old_item()
|
| /dports/devel/gbump/gbump-1.0.1/cargo-crates/libgit2-sys-0.9.1/libgit2/src/ |
| H A D | diff_generate.c | 226 if (!git_index_entry_is_conflict(old_entry)) { in diff_delta__from_two()
235 if (!git_index_entry_is_conflict(new_entry)) { in diff_delta__from_two()
767 if (git_index_entry_is_conflict(oitem) || in maybe_modified()
768 git_index_entry_is_conflict(nitem)) { in maybe_modified()
928 !git_index_entry_is_conflict(prev_entry) || in iterator_advance()
929 !git_index_entry_is_conflict(*entry)) in iterator_advance()
989 if (git_index_entry_is_conflict(nitem)) in handle_unmatched_new_item()
1141 if (git_index_entry_is_conflict(info->oitem)) in handle_unmatched_old_item()
|
| /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 | diff_generate.c | 226 if (!git_index_entry_is_conflict(old_entry)) { in diff_delta__from_two()
235 if (!git_index_entry_is_conflict(new_entry)) { in diff_delta__from_two()
785 if (git_index_entry_is_conflict(oitem) || in maybe_modified()
786 git_index_entry_is_conflict(nitem)) { in maybe_modified()
946 !git_index_entry_is_conflict(prev_entry) || in iterator_advance()
947 !git_index_entry_is_conflict(*entry)) in iterator_advance()
1007 if (git_index_entry_is_conflict(nitem)) in handle_unmatched_new_item()
1159 if (git_index_entry_is_conflict(info->oitem)) in handle_unmatched_old_item()
|
| /dports/misc/broot/broot-1.7.0/cargo-crates/libgit2-sys-0.12.21+1.1.0/libgit2/src/ |
| H A D | diff_generate.c | 226 if (!git_index_entry_is_conflict(old_entry)) { in diff_delta__from_two()
235 if (!git_index_entry_is_conflict(new_entry)) { in diff_delta__from_two()
785 if (git_index_entry_is_conflict(oitem) || in maybe_modified()
786 git_index_entry_is_conflict(nitem)) { in maybe_modified()
946 !git_index_entry_is_conflict(prev_entry) || in iterator_advance()
947 !git_index_entry_is_conflict(*entry)) in iterator_advance()
1007 if (git_index_entry_is_conflict(nitem)) in handle_unmatched_new_item()
1159 if (git_index_entry_is_conflict(info->oitem)) in handle_unmatched_old_item()
|
| /dports/devel/git-absorb/git-absorb-0.6.6/cargo-crates/libgit2-sys-0.12.13+1.0.1/libgit2/src/ |
| H A D | diff_generate.c | 226 if (!git_index_entry_is_conflict(old_entry)) { in diff_delta__from_two()
235 if (!git_index_entry_is_conflict(new_entry)) { in diff_delta__from_two()
766 if (git_index_entry_is_conflict(oitem) || in maybe_modified()
767 git_index_entry_is_conflict(nitem)) { in maybe_modified()
927 !git_index_entry_is_conflict(prev_entry) || in iterator_advance()
928 !git_index_entry_is_conflict(*entry)) in iterator_advance()
988 if (git_index_entry_is_conflict(nitem)) in handle_unmatched_new_item()
1140 if (git_index_entry_is_conflict(info->oitem)) in handle_unmatched_old_item()
|
| /dports/devel/R-cran-git2r/git2r/src/libgit2/src/ |
| H A D | diff_generate.c | 226 if (!git_index_entry_is_conflict(old_entry)) { in diff_delta__from_two()
235 if (!git_index_entry_is_conflict(new_entry)) { in diff_delta__from_two()
767 if (git_index_entry_is_conflict(oitem) || in maybe_modified()
768 git_index_entry_is_conflict(nitem)) { in maybe_modified()
928 !git_index_entry_is_conflict(prev_entry) || in iterator_advance()
929 !git_index_entry_is_conflict(*entry)) in iterator_advance()
989 if (git_index_entry_is_conflict(nitem)) in handle_unmatched_new_item()
1141 if (git_index_entry_is_conflict(info->oitem)) in handle_unmatched_old_item()
|
| /dports/devel/git-delta/delta-0.9.2/cargo-crates/libgit2-sys-0.12.24+1.3.0/libgit2/src/ |
| H A D | diff_generate.c | 226 if (!git_index_entry_is_conflict(old_entry)) { in diff_delta__from_two()
235 if (!git_index_entry_is_conflict(new_entry)) { in diff_delta__from_two()
785 if (git_index_entry_is_conflict(oitem) || in maybe_modified()
786 git_index_entry_is_conflict(nitem)) { in maybe_modified()
946 !git_index_entry_is_conflict(prev_entry) || in iterator_advance()
947 !git_index_entry_is_conflict(*entry)) in iterator_advance()
1007 if (git_index_entry_is_conflict(nitem)) in handle_unmatched_new_item()
1159 if (git_index_entry_is_conflict(info->oitem)) in handle_unmatched_old_item()
|
| /dports/sysutils/vector/vector-0.10.0/cargo-crates/libgit2-sys-0.12.7+1.0.0/libgit2/src/ |
| H A D | diff_generate.c | 226 if (!git_index_entry_is_conflict(old_entry)) { in diff_delta__from_two()
235 if (!git_index_entry_is_conflict(new_entry)) { in diff_delta__from_two()
766 if (git_index_entry_is_conflict(oitem) || in maybe_modified()
767 git_index_entry_is_conflict(nitem)) { in maybe_modified()
927 !git_index_entry_is_conflict(prev_entry) || in iterator_advance()
928 !git_index_entry_is_conflict(*entry)) in iterator_advance()
988 if (git_index_entry_is_conflict(nitem)) in handle_unmatched_new_item()
1140 if (git_index_entry_is_conflict(info->oitem)) in handle_unmatched_old_item()
|
| /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 | diff_generate.c | 226 if (!git_index_entry_is_conflict(old_entry)) { in diff_delta__from_two()
235 if (!git_index_entry_is_conflict(new_entry)) { in diff_delta__from_two()
786 if (git_index_entry_is_conflict(oitem) || in maybe_modified()
787 git_index_entry_is_conflict(nitem)) { in maybe_modified()
947 !git_index_entry_is_conflict(prev_entry) || in iterator_advance()
948 !git_index_entry_is_conflict(*entry)) in iterator_advance()
1008 if (git_index_entry_is_conflict(nitem)) in handle_unmatched_new_item()
1160 if (git_index_entry_is_conflict(info->oitem)) in handle_unmatched_old_item()
|
| /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 | diff_generate.c | 226 if (!git_index_entry_is_conflict(old_entry)) { in diff_delta__from_two()
235 if (!git_index_entry_is_conflict(new_entry)) { in diff_delta__from_two()
785 if (git_index_entry_is_conflict(oitem) || in maybe_modified()
786 git_index_entry_is_conflict(nitem)) { in maybe_modified()
946 !git_index_entry_is_conflict(prev_entry) || in iterator_advance()
947 !git_index_entry_is_conflict(*entry)) in iterator_advance()
1007 if (git_index_entry_is_conflict(nitem)) in handle_unmatched_new_item()
1159 if (git_index_entry_is_conflict(info->oitem)) in handle_unmatched_old_item()
|
| /dports/devel/tokei/tokei-12.1.2/cargo-crates/libgit2-sys-0.12.17+1.1.0/libgit2/src/ |
| H A D | diff_generate.c | 226 if (!git_index_entry_is_conflict(old_entry)) { in diff_delta__from_two()
235 if (!git_index_entry_is_conflict(new_entry)) { in diff_delta__from_two()
786 if (git_index_entry_is_conflict(oitem) || in maybe_modified()
787 git_index_entry_is_conflict(nitem)) { in maybe_modified()
947 !git_index_entry_is_conflict(prev_entry) || in iterator_advance()
948 !git_index_entry_is_conflict(*entry)) in iterator_advance()
1008 if (git_index_entry_is_conflict(nitem)) in handle_unmatched_new_item()
1160 if (git_index_entry_is_conflict(info->oitem)) in handle_unmatched_old_item()
|
| /dports/devel/gitui/gitui-0.10.1/cargo-crates/libgit2-sys-0.12.12+1.0.1/libgit2/src/ |
| H A D | diff_generate.c | 226 if (!git_index_entry_is_conflict(old_entry)) { in diff_delta__from_two()
235 if (!git_index_entry_is_conflict(new_entry)) { in diff_delta__from_two()
766 if (git_index_entry_is_conflict(oitem) || in maybe_modified()
767 git_index_entry_is_conflict(nitem)) { in maybe_modified()
927 !git_index_entry_is_conflict(prev_entry) || in iterator_advance()
928 !git_index_entry_is_conflict(*entry)) in iterator_advance()
988 if (git_index_entry_is_conflict(nitem)) in handle_unmatched_new_item()
1140 if (git_index_entry_is_conflict(info->oitem)) in handle_unmatched_old_item()
|
| /dports/devel/cargo-generate/cargo-generate-0.9.0/cargo-crates/libgit2-sys-0.12.22+1.1.0/libgit2/src/ |
| H A D | diff_generate.c | 226 if (!git_index_entry_is_conflict(old_entry)) { in diff_delta__from_two()
235 if (!git_index_entry_is_conflict(new_entry)) { in diff_delta__from_two()
785 if (git_index_entry_is_conflict(oitem) || in maybe_modified()
786 git_index_entry_is_conflict(nitem)) { in maybe_modified()
946 !git_index_entry_is_conflict(prev_entry) || in iterator_advance()
947 !git_index_entry_is_conflict(*entry)) in iterator_advance()
1007 if (git_index_entry_is_conflict(nitem)) in handle_unmatched_new_item()
1159 if (git_index_entry_is_conflict(info->oitem)) in handle_unmatched_old_item()
|
| /dports/sysutils/onefetch/onefetch-2.10.2/cargo-crates/libgit2-sys-0.12.21+1.1.0/libgit2/src/ |
| H A D | diff_generate.c | 226 if (!git_index_entry_is_conflict(old_entry)) { in diff_delta__from_two()
235 if (!git_index_entry_is_conflict(new_entry)) { in diff_delta__from_two()
785 if (git_index_entry_is_conflict(oitem) || in maybe_modified()
786 git_index_entry_is_conflict(nitem)) { in maybe_modified()
946 !git_index_entry_is_conflict(prev_entry) || in iterator_advance()
947 !git_index_entry_is_conflict(*entry)) in iterator_advance()
1007 if (git_index_entry_is_conflict(nitem)) in handle_unmatched_new_item()
1159 if (git_index_entry_is_conflict(info->oitem)) in handle_unmatched_old_item()
|
| /dports/devel/pijul/pijul-1.0.0.a55/cargo-crates/libgit2-sys-0.12.24+1.3.0/libgit2/src/ |
| H A D | diff_generate.c | 226 if (!git_index_entry_is_conflict(old_entry)) { in diff_delta__from_two()
235 if (!git_index_entry_is_conflict(new_entry)) { in diff_delta__from_two()
785 if (git_index_entry_is_conflict(oitem) || in maybe_modified()
786 git_index_entry_is_conflict(nitem)) { in maybe_modified()
946 !git_index_entry_is_conflict(prev_entry) || in iterator_advance()
947 !git_index_entry_is_conflict(*entry)) in iterator_advance()
1007 if (git_index_entry_is_conflict(nitem)) in handle_unmatched_new_item()
1159 if (git_index_entry_is_conflict(info->oitem)) in handle_unmatched_old_item()
|
| /dports/textproc/mdbook-linkcheck/mdbook-linkcheck-0.7.6/cargo-crates/libgit2-sys-0.12.24+1.3.0/libgit2/src/ |
| H A D | diff_generate.c | 226 if (!git_index_entry_is_conflict(old_entry)) { in diff_delta__from_two()
235 if (!git_index_entry_is_conflict(new_entry)) { in diff_delta__from_two()
785 if (git_index_entry_is_conflict(oitem) || in maybe_modified()
786 git_index_entry_is_conflict(nitem)) { in maybe_modified()
946 !git_index_entry_is_conflict(prev_entry) || in iterator_advance()
947 !git_index_entry_is_conflict(*entry)) in iterator_advance()
1007 if (git_index_entry_is_conflict(nitem)) in handle_unmatched_new_item()
1159 if (git_index_entry_is_conflict(info->oitem)) in handle_unmatched_old_item()
|
| /dports/lang/rust/rustc-1.58.1-src/vendor/libgit2-sys/libgit2/src/ |
| H A D | diff_generate.c | 226 if (!git_index_entry_is_conflict(old_entry)) { in diff_delta__from_two()
235 if (!git_index_entry_is_conflict(new_entry)) { in diff_delta__from_two()
785 if (git_index_entry_is_conflict(oitem) || in maybe_modified()
786 git_index_entry_is_conflict(nitem)) { in maybe_modified()
946 !git_index_entry_is_conflict(prev_entry) || in iterator_advance()
947 !git_index_entry_is_conflict(*entry)) in iterator_advance()
1007 if (git_index_entry_is_conflict(nitem)) in handle_unmatched_new_item()
1159 if (git_index_entry_is_conflict(info->oitem)) in handle_unmatched_old_item()
|
| /dports/sysutils/exa/exa-0.10.1/cargo-crates/libgit2-sys-0.12.18+1.1.0/libgit2/src/ |
| H A D | diff_generate.c | 226 if (!git_index_entry_is_conflict(old_entry)) { in diff_delta__from_two()
235 if (!git_index_entry_is_conflict(new_entry)) { in diff_delta__from_two()
786 if (git_index_entry_is_conflict(oitem) || in maybe_modified()
787 git_index_entry_is_conflict(nitem)) { in maybe_modified()
947 !git_index_entry_is_conflict(prev_entry) || in iterator_advance()
948 !git_index_entry_is_conflict(*entry)) in iterator_advance()
1008 if (git_index_entry_is_conflict(nitem)) in handle_unmatched_new_item()
1160 if (git_index_entry_is_conflict(info->oitem)) in handle_unmatched_old_item()
|
| /dports/devel/libgit2/libgit2-1.3.0/src/ |
| H A D | diff_generate.c | 226 if (!git_index_entry_is_conflict(old_entry)) { in diff_delta__from_two()
235 if (!git_index_entry_is_conflict(new_entry)) { in diff_delta__from_two()
785 if (git_index_entry_is_conflict(oitem) || in maybe_modified()
786 git_index_entry_is_conflict(nitem)) { in maybe_modified()
946 !git_index_entry_is_conflict(prev_entry) || in iterator_advance()
947 !git_index_entry_is_conflict(*entry)) in iterator_advance()
1007 if (git_index_entry_is_conflict(nitem)) in handle_unmatched_new_item()
1159 if (git_index_entry_is_conflict(info->oitem)) in handle_unmatched_old_item()
|
| /dports/textproc/bat/bat-0.18.3/cargo-crates/libgit2-sys-0.12.21+1.1.0/libgit2/src/ |
| H A D | diff_generate.c | 226 if (!git_index_entry_is_conflict(old_entry)) { in diff_delta__from_two()
235 if (!git_index_entry_is_conflict(new_entry)) { in diff_delta__from_two()
785 if (git_index_entry_is_conflict(oitem) || in maybe_modified()
786 git_index_entry_is_conflict(nitem)) { in maybe_modified()
946 !git_index_entry_is_conflict(prev_entry) || in iterator_advance()
947 !git_index_entry_is_conflict(*entry)) in iterator_advance()
1007 if (git_index_entry_is_conflict(nitem)) in handle_unmatched_new_item()
1159 if (git_index_entry_is_conflict(info->oitem)) in handle_unmatched_old_item()
|
| /dports/devel/sentry-cli/sentry-cli-1.71.0/cargo-crates/libgit2-sys-0.12.23+1.2.0/libgit2/src/ |
| H A D | diff_generate.c | 226 if (!git_index_entry_is_conflict(old_entry)) { in diff_delta__from_two()
235 if (!git_index_entry_is_conflict(new_entry)) { in diff_delta__from_two()
785 if (git_index_entry_is_conflict(oitem) || in maybe_modified()
786 git_index_entry_is_conflict(nitem)) { in maybe_modified()
946 !git_index_entry_is_conflict(prev_entry) || in iterator_advance()
947 !git_index_entry_is_conflict(*entry)) in iterator_advance()
1007 if (git_index_entry_is_conflict(nitem)) in handle_unmatched_new_item()
1159 if (git_index_entry_is_conflict(info->oitem)) in handle_unmatched_old_item()
|
| /dports/devel/libgit2/libgit2-1.3.0/tests/worktree/ |
| H A D | merge.c | 105 if (git_index_entry_is_conflict(entry)) in test_worktree_merge__merge_conflict()
|
| /dports/devel/libgit2/libgit2-1.3.0/tests/index/ |
| H A D | conflicts.c | 302 cl_assert(!git_index_entry_is_conflict(entry)); in test_index_conflicts__moved_to_reuc_on_add()
342 cl_assert(!git_index_entry_is_conflict(entry)); in test_index_conflicts__remove_all_conflicts()
|
| /dports/devel/interactive_rebase_tool/git-interactive-rebase-tool-1.2.1/cargo-crates/libgit2-sys-0.7.11/libgit2/include/git2/ |
| H A D | index.h | 491 GIT_EXTERN(int) git_index_entry_is_conflict(const git_index_entry *entry);
|
| /dports/devel/sentry-cli/sentry-cli-1.71.0/cargo-crates/libgit2-sys-0.12.23+1.2.0/libgit2/include/git2/ |
| H A D | index.h | 475 GIT_EXTERN(int) git_index_entry_is_conflict(const git_index_entry *entry);
|