| /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 | 630 int ours_changed, theirs_changed, ours_theirs_differ; in merge_conflict_resolve_trivial() local
681 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
687 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_trivial()
690 else if (ours_changed && !theirs_changed) in merge_conflict_resolve_trivial()
693 else if (!ours_changed && theirs_changed) in merge_conflict_resolve_trivial()
714 int ours_changed, theirs_changed; in merge_conflict_resolve_one_removed() local
732 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
738 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_one_removed()
753 int ours_changed, theirs_changed; in merge_conflict_resolve_one_renamed() local
781 if (ours_changed && theirs_changed && in merge_conflict_resolve_one_renamed()
[all …]
|
| /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 | 666 int ours_changed, theirs_changed, ours_theirs_differ; in merge_conflict_resolve_trivial() local
719 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
725 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_trivial()
728 else if (ours_changed && !theirs_changed) in merge_conflict_resolve_trivial()
731 else if (!ours_changed && theirs_changed) in merge_conflict_resolve_trivial()
752 int ours_changed, theirs_changed; in merge_conflict_resolve_one_removed() local
772 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
778 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_one_removed()
793 int ours_changed, theirs_changed; in merge_conflict_resolve_one_renamed() local
826 if (ours_changed && theirs_changed && in merge_conflict_resolve_one_renamed()
[all …]
|
| /dports/misc/broot/broot-1.7.0/cargo-crates/libgit2-sys-0.12.21+1.1.0/libgit2/src/ |
| H A D | merge.c | 656 int ours_changed, theirs_changed, ours_theirs_differ; in merge_conflict_resolve_trivial() local
709 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
715 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_trivial()
718 else if (ours_changed && !theirs_changed) in merge_conflict_resolve_trivial()
721 else if (!ours_changed && theirs_changed) in merge_conflict_resolve_trivial()
742 int ours_changed, theirs_changed; in merge_conflict_resolve_one_removed() local
762 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
768 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_one_removed()
783 int ours_changed, theirs_changed; in merge_conflict_resolve_one_renamed() local
813 if (ours_changed && theirs_changed && in merge_conflict_resolve_one_renamed()
[all …]
|
| /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 | 649 int ours_changed, theirs_changed, ours_theirs_differ; in merge_conflict_resolve_trivial() local
700 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
706 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_trivial()
709 else if (ours_changed && !theirs_changed) in merge_conflict_resolve_trivial()
712 else if (!ours_changed && theirs_changed) in merge_conflict_resolve_trivial()
733 int ours_changed, theirs_changed; in merge_conflict_resolve_one_removed() local
751 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
757 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_one_removed()
772 int ours_changed, theirs_changed; in merge_conflict_resolve_one_renamed() local
800 if (ours_changed && theirs_changed && in merge_conflict_resolve_one_renamed()
[all …]
|
| /dports/devel/R-cran-git2r/git2r/src/libgit2/src/ |
| H A D | merge.c | 630 int ours_changed, theirs_changed, ours_theirs_differ; in merge_conflict_resolve_trivial() local
681 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
687 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_trivial()
690 else if (ours_changed && !theirs_changed) in merge_conflict_resolve_trivial()
693 else if (!ours_changed && theirs_changed) in merge_conflict_resolve_trivial()
714 int ours_changed, theirs_changed; in merge_conflict_resolve_one_removed() local
732 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
738 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_one_removed()
753 int ours_changed, theirs_changed; in merge_conflict_resolve_one_renamed() local
781 if (ours_changed && theirs_changed && in merge_conflict_resolve_one_renamed()
[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 | 666 int ours_changed, theirs_changed, ours_theirs_differ; in merge_conflict_resolve_trivial() local
719 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
725 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_trivial()
728 else if (ours_changed && !theirs_changed) in merge_conflict_resolve_trivial()
731 else if (!ours_changed && theirs_changed) in merge_conflict_resolve_trivial()
752 int ours_changed, theirs_changed; in merge_conflict_resolve_one_removed() local
772 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
778 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_one_removed()
793 int ours_changed, theirs_changed; in merge_conflict_resolve_one_renamed() local
826 if (ours_changed && theirs_changed && in merge_conflict_resolve_one_renamed()
[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 | 649 int ours_changed, theirs_changed, ours_theirs_differ; in merge_conflict_resolve_trivial() local
700 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
706 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_trivial()
709 else if (ours_changed && !theirs_changed) in merge_conflict_resolve_trivial()
712 else if (!ours_changed && theirs_changed) in merge_conflict_resolve_trivial()
733 int ours_changed, theirs_changed; in merge_conflict_resolve_one_removed() local
751 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
757 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_one_removed()
772 int ours_changed, theirs_changed; in merge_conflict_resolve_one_renamed() local
800 if (ours_changed && theirs_changed && in merge_conflict_resolve_one_renamed()
[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 | 666 int ours_changed, theirs_changed, ours_theirs_differ; in merge_conflict_resolve_trivial() local
719 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
725 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_trivial()
728 else if (ours_changed && !theirs_changed) in merge_conflict_resolve_trivial()
731 else if (!ours_changed && theirs_changed) in merge_conflict_resolve_trivial()
752 int ours_changed, theirs_changed; in merge_conflict_resolve_one_removed() local
772 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
778 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_one_removed()
793 int ours_changed, theirs_changed; in merge_conflict_resolve_one_renamed() local
823 if (ours_changed && theirs_changed && in merge_conflict_resolve_one_renamed()
[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 | 656 int ours_changed, theirs_changed, ours_theirs_differ; in merge_conflict_resolve_trivial() local
709 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
715 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_trivial()
718 else if (ours_changed && !theirs_changed) in merge_conflict_resolve_trivial()
721 else if (!ours_changed && theirs_changed) in merge_conflict_resolve_trivial()
742 int ours_changed, theirs_changed; in merge_conflict_resolve_one_removed() local
762 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
768 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_one_removed()
783 int ours_changed, theirs_changed; in merge_conflict_resolve_one_renamed() local
813 if (ours_changed && theirs_changed && in merge_conflict_resolve_one_renamed()
[all …]
|
| /dports/devel/gbump/gbump-1.0.1/cargo-crates/libgit2-sys-0.9.1/libgit2/src/ |
| H A D | merge.c | 630 int ours_changed, theirs_changed, ours_theirs_differ; in merge_conflict_resolve_trivial() local
681 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
687 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_trivial()
690 else if (ours_changed && !theirs_changed) in merge_conflict_resolve_trivial()
693 else if (!ours_changed && theirs_changed) in merge_conflict_resolve_trivial()
714 int ours_changed, theirs_changed; in merge_conflict_resolve_one_removed() local
732 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
738 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_one_removed()
753 int ours_changed, theirs_changed; in merge_conflict_resolve_one_renamed() local
781 if (ours_changed && theirs_changed && in merge_conflict_resolve_one_renamed()
[all …]
|
| /dports/devel/libgit2/libgit2-1.3.0/src/ |
| H A D | merge.c | 666 int ours_changed, theirs_changed, ours_theirs_differ; in merge_conflict_resolve_trivial() local
719 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
725 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_trivial()
728 else if (ours_changed && !theirs_changed) in merge_conflict_resolve_trivial()
731 else if (!ours_changed && theirs_changed) in merge_conflict_resolve_trivial()
752 int ours_changed, theirs_changed; in merge_conflict_resolve_one_removed() local
772 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
778 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_one_removed()
793 int ours_changed, theirs_changed; in merge_conflict_resolve_one_renamed() local
826 if (ours_changed && theirs_changed && in merge_conflict_resolve_one_renamed()
[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 | 649 int ours_changed, theirs_changed, ours_theirs_differ; in merge_conflict_resolve_trivial() local
700 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
706 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_trivial()
709 else if (ours_changed && !theirs_changed) in merge_conflict_resolve_trivial()
712 else if (!ours_changed && theirs_changed) in merge_conflict_resolve_trivial()
733 int ours_changed, theirs_changed; in merge_conflict_resolve_one_removed() local
751 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
757 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_one_removed()
772 int ours_changed, theirs_changed; in merge_conflict_resolve_one_renamed() local
800 if (ours_changed && theirs_changed && in merge_conflict_resolve_one_renamed()
[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 | 656 int ours_changed, theirs_changed, ours_theirs_differ; in merge_conflict_resolve_trivial() local
709 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
715 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_trivial()
718 else if (ours_changed && !theirs_changed) in merge_conflict_resolve_trivial()
721 else if (!ours_changed && theirs_changed) in merge_conflict_resolve_trivial()
742 int ours_changed, theirs_changed; in merge_conflict_resolve_one_removed() local
762 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
768 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_one_removed()
783 int ours_changed, theirs_changed; in merge_conflict_resolve_one_renamed() local
813 if (ours_changed && theirs_changed && in merge_conflict_resolve_one_renamed()
[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 | 656 int ours_changed, theirs_changed, ours_theirs_differ; in merge_conflict_resolve_trivial() local
709 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
715 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_trivial()
718 else if (ours_changed && !theirs_changed) in merge_conflict_resolve_trivial()
721 else if (!ours_changed && theirs_changed) in merge_conflict_resolve_trivial()
742 int ours_changed, theirs_changed; in merge_conflict_resolve_one_removed() local
762 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
768 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_one_removed()
783 int ours_changed, theirs_changed; in merge_conflict_resolve_one_renamed() local
813 if (ours_changed && theirs_changed && in merge_conflict_resolve_one_renamed()
[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 | 656 int ours_changed, theirs_changed, ours_theirs_differ; in merge_conflict_resolve_trivial() local
709 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
715 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_trivial()
718 else if (ours_changed && !theirs_changed) in merge_conflict_resolve_trivial()
721 else if (!ours_changed && theirs_changed) in merge_conflict_resolve_trivial()
742 int ours_changed, theirs_changed; in merge_conflict_resolve_one_removed() local
762 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
768 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_one_removed()
783 int ours_changed, theirs_changed; in merge_conflict_resolve_one_renamed() local
813 if (ours_changed && theirs_changed && in merge_conflict_resolve_one_renamed()
[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 | 666 int ours_changed, theirs_changed, ours_theirs_differ; in merge_conflict_resolve_trivial() local
719 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
725 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_trivial()
728 else if (ours_changed && !theirs_changed) in merge_conflict_resolve_trivial()
731 else if (!ours_changed && theirs_changed) in merge_conflict_resolve_trivial()
752 int ours_changed, theirs_changed; in merge_conflict_resolve_one_removed() local
772 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
778 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_one_removed()
793 int ours_changed, theirs_changed; in merge_conflict_resolve_one_renamed() local
826 if (ours_changed && theirs_changed && in merge_conflict_resolve_one_renamed()
[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 | 666 int ours_changed, theirs_changed, ours_theirs_differ; in merge_conflict_resolve_trivial() local
719 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
725 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_trivial()
728 else if (ours_changed && !theirs_changed) in merge_conflict_resolve_trivial()
731 else if (!ours_changed && theirs_changed) in merge_conflict_resolve_trivial()
752 int ours_changed, theirs_changed; in merge_conflict_resolve_one_removed() local
772 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
778 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_one_removed()
793 int ours_changed, theirs_changed; in merge_conflict_resolve_one_renamed() local
826 if (ours_changed && theirs_changed && in merge_conflict_resolve_one_renamed()
[all …]
|
| /dports/lang/rust/rustc-1.58.1-src/vendor/libgit2-sys/libgit2/src/ |
| H A D | merge.c | 666 int ours_changed, theirs_changed, ours_theirs_differ; in merge_conflict_resolve_trivial() local
719 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
725 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_trivial()
728 else if (ours_changed && !theirs_changed) in merge_conflict_resolve_trivial()
731 else if (!ours_changed && theirs_changed) in merge_conflict_resolve_trivial()
752 int ours_changed, theirs_changed; in merge_conflict_resolve_one_removed() local
772 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
778 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_one_removed()
793 int ours_changed, theirs_changed; in merge_conflict_resolve_one_renamed() local
826 if (ours_changed && theirs_changed && in merge_conflict_resolve_one_renamed()
[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 | 656 int ours_changed, theirs_changed, ours_theirs_differ; in merge_conflict_resolve_trivial() local
709 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
715 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_trivial()
718 else if (ours_changed && !theirs_changed) in merge_conflict_resolve_trivial()
721 else if (!ours_changed && theirs_changed) in merge_conflict_resolve_trivial()
742 int ours_changed, theirs_changed; in merge_conflict_resolve_one_removed() local
762 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
768 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_one_removed()
783 int ours_changed, theirs_changed; in merge_conflict_resolve_one_renamed() local
813 if (ours_changed && theirs_changed && in merge_conflict_resolve_one_renamed()
[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 | 656 int ours_changed, theirs_changed, ours_theirs_differ; in merge_conflict_resolve_trivial() local
709 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
715 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_trivial()
718 else if (ours_changed && !theirs_changed) in merge_conflict_resolve_trivial()
721 else if (!ours_changed && theirs_changed) in merge_conflict_resolve_trivial()
742 int ours_changed, theirs_changed; in merge_conflict_resolve_one_removed() local
762 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
768 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_one_removed()
783 int ours_changed, theirs_changed; in merge_conflict_resolve_one_renamed() local
813 if (ours_changed && theirs_changed && in merge_conflict_resolve_one_renamed()
[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 | 666 int ours_changed, theirs_changed, ours_theirs_differ; in merge_conflict_resolve_trivial() local
719 else if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_trivial()
725 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_trivial()
728 else if (ours_changed && !theirs_changed) in merge_conflict_resolve_trivial()
731 else if (!ours_changed && theirs_changed) in merge_conflict_resolve_trivial()
752 int ours_changed, theirs_changed; in merge_conflict_resolve_one_removed() local
772 if (ours_changed && ours_empty && theirs_empty) in merge_conflict_resolve_one_removed()
778 else if (!ours_changed && theirs_empty) in merge_conflict_resolve_one_removed()
793 int ours_changed, theirs_changed; in merge_conflict_resolve_one_renamed() local
823 if (ours_changed && theirs_changed && in merge_conflict_resolve_one_renamed()
[all …]
|