| /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 | 629 int ours_empty, theirs_empty; in merge_conflict_resolve_trivial() local
646 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_trivial()
678 if (ours_changed && !ours_empty && !ours_theirs_differ) in merge_conflict_resolve_trivial()
681 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
684 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_trivial()
713 int ours_empty, theirs_empty; in merge_conflict_resolve_one_removed() local
725 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_one_removed()
732 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
735 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_one_removed()
|
| /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 | 665 int ours_empty, theirs_empty; in merge_conflict_resolve_trivial() local
684 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_trivial()
716 if (ours_changed && !ours_empty && !ours_theirs_differ) in merge_conflict_resolve_trivial()
719 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
722 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_trivial()
751 int ours_empty, theirs_empty; in merge_conflict_resolve_one_removed() local
765 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_one_removed()
772 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
775 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_one_removed()
|
| /dports/misc/broot/broot-1.7.0/cargo-crates/libgit2-sys-0.12.21+1.1.0/libgit2/src/ |
| H A D | merge.c | 655 int ours_empty, theirs_empty; in merge_conflict_resolve_trivial() local
674 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_trivial()
706 if (ours_changed && !ours_empty && !ours_theirs_differ) in merge_conflict_resolve_trivial()
709 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
712 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_trivial()
741 int ours_empty, theirs_empty; in merge_conflict_resolve_one_removed() local
755 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_one_removed()
762 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
765 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_one_removed()
|
| /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 | 648 int ours_empty, theirs_empty; in merge_conflict_resolve_trivial() local
665 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_trivial()
697 if (ours_changed && !ours_empty && !ours_theirs_differ) in merge_conflict_resolve_trivial()
700 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
703 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_trivial()
732 int ours_empty, theirs_empty; in merge_conflict_resolve_one_removed() local
744 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_one_removed()
751 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
754 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_one_removed()
|
| /dports/devel/R-cran-git2r/git2r/src/libgit2/src/ |
| H A D | merge.c | 629 int ours_empty, theirs_empty; in merge_conflict_resolve_trivial() local
646 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_trivial()
678 if (ours_changed && !ours_empty && !ours_theirs_differ) in merge_conflict_resolve_trivial()
681 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
684 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_trivial()
713 int ours_empty, theirs_empty; in merge_conflict_resolve_one_removed() local
725 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_one_removed()
732 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
735 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_one_removed()
|
| /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 | 665 int ours_empty, theirs_empty; in merge_conflict_resolve_trivial() local
684 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_trivial()
716 if (ours_changed && !ours_empty && !ours_theirs_differ) in merge_conflict_resolve_trivial()
719 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
722 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_trivial()
751 int ours_empty, theirs_empty; in merge_conflict_resolve_one_removed() local
765 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_one_removed()
772 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
775 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_one_removed()
|
| /dports/sysutils/vector/vector-0.10.0/cargo-crates/libgit2-sys-0.12.7+1.0.0/libgit2/src/ |
| H A D | merge.c | 648 int ours_empty, theirs_empty; in merge_conflict_resolve_trivial() local
665 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_trivial()
697 if (ours_changed && !ours_empty && !ours_theirs_differ) in merge_conflict_resolve_trivial()
700 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
703 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_trivial()
732 int ours_empty, theirs_empty; in merge_conflict_resolve_one_removed() local
744 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_one_removed()
751 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
754 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_one_removed()
|
| /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 | 665 int ours_empty, theirs_empty; in merge_conflict_resolve_trivial() local
684 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_trivial()
716 if (ours_changed && !ours_empty && !ours_theirs_differ) in merge_conflict_resolve_trivial()
719 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
722 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_trivial()
751 int ours_empty, theirs_empty; in merge_conflict_resolve_one_removed() local
765 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_one_removed()
772 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
775 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_one_removed()
|
| /dports/devel/tokei/tokei-12.1.2/cargo-crates/libgit2-sys-0.12.17+1.1.0/libgit2/src/ |
| H A D | merge.c | 655 int ours_empty, theirs_empty; in merge_conflict_resolve_trivial() local
674 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_trivial()
706 if (ours_changed && !ours_empty && !ours_theirs_differ) in merge_conflict_resolve_trivial()
709 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
712 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_trivial()
741 int ours_empty, theirs_empty; in merge_conflict_resolve_one_removed() local
755 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_one_removed()
762 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
765 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_one_removed()
|
| /dports/devel/gbump/gbump-1.0.1/cargo-crates/libgit2-sys-0.9.1/libgit2/src/ |
| H A D | merge.c | 629 int ours_empty, theirs_empty; in merge_conflict_resolve_trivial() local
646 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_trivial()
678 if (ours_changed && !ours_empty && !ours_theirs_differ) in merge_conflict_resolve_trivial()
681 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
684 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_trivial()
713 int ours_empty, theirs_empty; in merge_conflict_resolve_one_removed() local
725 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_one_removed()
732 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
735 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_one_removed()
|
| /dports/devel/libgit2/libgit2-1.3.0/src/ |
| H A D | merge.c | 665 int ours_empty, theirs_empty; in merge_conflict_resolve_trivial() local
684 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_trivial()
716 if (ours_changed && !ours_empty && !ours_theirs_differ) in merge_conflict_resolve_trivial()
719 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
722 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_trivial()
751 int ours_empty, theirs_empty; in merge_conflict_resolve_one_removed() local
765 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_one_removed()
772 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
775 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_one_removed()
|
| /dports/devel/gitui/gitui-0.10.1/cargo-crates/libgit2-sys-0.12.12+1.0.1/libgit2/src/ |
| H A D | merge.c | 648 int ours_empty, theirs_empty; in merge_conflict_resolve_trivial() local
665 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_trivial()
697 if (ours_changed && !ours_empty && !ours_theirs_differ) in merge_conflict_resolve_trivial()
700 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
703 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_trivial()
732 int ours_empty, theirs_empty; in merge_conflict_resolve_one_removed() local
744 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_one_removed()
751 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
754 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_one_removed()
|
| /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 | 655 int ours_empty, theirs_empty; in merge_conflict_resolve_trivial() local
674 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_trivial()
706 if (ours_changed && !ours_empty && !ours_theirs_differ) in merge_conflict_resolve_trivial()
709 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
712 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_trivial()
741 int ours_empty, theirs_empty; in merge_conflict_resolve_one_removed() local
755 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_one_removed()
762 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
765 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_one_removed()
|
| /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 | 655 int ours_empty, theirs_empty; in merge_conflict_resolve_trivial() local
674 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_trivial()
706 if (ours_changed && !ours_empty && !ours_theirs_differ) in merge_conflict_resolve_trivial()
709 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
712 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_trivial()
741 int ours_empty, theirs_empty; in merge_conflict_resolve_one_removed() local
755 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_one_removed()
762 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
765 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_one_removed()
|
| /dports/sysutils/onefetch/onefetch-2.10.2/cargo-crates/libgit2-sys-0.12.21+1.1.0/libgit2/src/ |
| H A D | merge.c | 655 int ours_empty, theirs_empty; in merge_conflict_resolve_trivial() local
674 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_trivial()
706 if (ours_changed && !ours_empty && !ours_theirs_differ) in merge_conflict_resolve_trivial()
709 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
712 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_trivial()
741 int ours_empty, theirs_empty; in merge_conflict_resolve_one_removed() local
755 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_one_removed()
762 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
765 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_one_removed()
|
| /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 | 665 int ours_empty, theirs_empty; in merge_conflict_resolve_trivial() local
684 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_trivial()
716 if (ours_changed && !ours_empty && !ours_theirs_differ) in merge_conflict_resolve_trivial()
719 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
722 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_trivial()
751 int ours_empty, theirs_empty; in merge_conflict_resolve_one_removed() local
765 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_one_removed()
772 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
775 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_one_removed()
|
| /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 | 665 int ours_empty, theirs_empty; in merge_conflict_resolve_trivial() local
684 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_trivial()
716 if (ours_changed && !ours_empty && !ours_theirs_differ) in merge_conflict_resolve_trivial()
719 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
722 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_trivial()
751 int ours_empty, theirs_empty; in merge_conflict_resolve_one_removed() local
765 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_one_removed()
772 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
775 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_one_removed()
|
| /dports/lang/rust/rustc-1.58.1-src/vendor/libgit2-sys/libgit2/src/ |
| H A D | merge.c | 665 int ours_empty, theirs_empty; in merge_conflict_resolve_trivial() local
684 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_trivial()
716 if (ours_changed && !ours_empty && !ours_theirs_differ) in merge_conflict_resolve_trivial()
719 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
722 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_trivial()
751 int ours_empty, theirs_empty; in merge_conflict_resolve_one_removed() local
765 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_one_removed()
772 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
775 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_one_removed()
|
| /dports/sysutils/exa/exa-0.10.1/cargo-crates/libgit2-sys-0.12.18+1.1.0/libgit2/src/ |
| H A D | merge.c | 655 int ours_empty, theirs_empty; in merge_conflict_resolve_trivial() local
674 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_trivial()
706 if (ours_changed && !ours_empty && !ours_theirs_differ) in merge_conflict_resolve_trivial()
709 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
712 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_trivial()
741 int ours_empty, theirs_empty; in merge_conflict_resolve_one_removed() local
755 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_one_removed()
762 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
765 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_one_removed()
|
| /dports/textproc/bat/bat-0.18.3/cargo-crates/libgit2-sys-0.12.21+1.1.0/libgit2/src/ |
| H A D | merge.c | 655 int ours_empty, theirs_empty; in merge_conflict_resolve_trivial() local
674 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_trivial()
706 if (ours_changed && !ours_empty && !ours_theirs_differ) in merge_conflict_resolve_trivial()
709 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
712 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_trivial()
741 int ours_empty, theirs_empty; in merge_conflict_resolve_one_removed() local
755 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_one_removed()
762 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
765 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_one_removed()
|
| /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 | 665 int ours_empty, theirs_empty; in merge_conflict_resolve_trivial() local
684 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_trivial()
716 if (ours_changed && !ours_empty && !ours_theirs_differ) in merge_conflict_resolve_trivial()
719 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
722 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_trivial()
751 int ours_empty, theirs_empty; in merge_conflict_resolve_one_removed() local
765 ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); in merge_conflict_resolve_one_removed()
772 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
775 else if (ours_empty && !theirs_changed) in merge_conflict_resolve_one_removed()
|