Home
last modified time | relevance | path

Searched refs:GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2 (Results 1 – 25 of 43) sorted by relevance

12

/dports/devel/interactive_rebase_tool/git-interactive-rebase-tool-1.2.1/cargo-crates/libgit2-sys-0.7.11/libgit2/src/
H A Dmerge.h75 GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2 = (1 << 8), enumerator
H A Dmerge.c773 conflict->type == GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2 || in merge_conflict_resolve_one_renamed()
1358 ours_source->type = GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2; in merge_diff_mark_rename_conflict()
1373 theirs_source->type = GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2; in merge_diff_mark_rename_conflict()
/dports/misc/broot/broot-1.7.0/cargo-crates/libgit2-sys-0.12.21+1.1.0/libgit2/src/
H A Dmerge.h75 GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2 = (1 << 8), enumerator
H A Dmerge.c805 conflict->type == GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2 || in merge_conflict_resolve_one_renamed()
1387 ours_source->type = GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2; in merge_diff_mark_rename_conflict()
1402 theirs_source->type = GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2; in merge_diff_mark_rename_conflict()
/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 Dmerge.h75 GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2 = (1 << 8), enumerator
H A Dmerge.c815 conflict->type == GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2 || in merge_conflict_resolve_one_renamed()
1400 ours_source->type = GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2; in merge_diff_mark_rename_conflict()
1415 theirs_source->type = GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2; in merge_diff_mark_rename_conflict()
/dports/devel/sentry-cli/sentry-cli-1.71.0/cargo-crates/libgit2-sys-0.12.23+1.2.0/libgit2/src/
H A Dmerge.h75 GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2 = (1 << 8), enumerator
/dports/devel/git-absorb/git-absorb-0.6.6/cargo-crates/libgit2-sys-0.12.13+1.0.1/libgit2/src/
H A Dmerge.h75 GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2 = (1 << 8), enumerator
/dports/devel/R-cran-git2r/git2r/src/libgit2/src/
H A Dmerge.h75 GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2 = (1 << 8), enumerator
/dports/devel/git-delta/delta-0.9.2/cargo-crates/libgit2-sys-0.12.24+1.3.0/libgit2/src/
H A Dmerge.h75 GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2 = (1 << 8), enumerator
/dports/sysutils/vector/vector-0.10.0/cargo-crates/libgit2-sys-0.12.7+1.0.0/libgit2/src/
H A Dmerge.h75 GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2 = (1 << 8), enumerator
/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 Dmerge.h75 GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2 = (1 << 8), enumerator
/dports/devel/tokei/tokei-12.1.2/cargo-crates/libgit2-sys-0.12.17+1.1.0/libgit2/src/
H A Dmerge.h75 GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2 = (1 << 8), enumerator
/dports/devel/gbump/gbump-1.0.1/cargo-crates/libgit2-sys-0.9.1/libgit2/src/
H A Dmerge.h75 GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2 = (1 << 8), enumerator
/dports/devel/libgit2/libgit2-1.3.0/src/
H A Dmerge.h75 GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2 = (1 << 8), enumerator
/dports/devel/gitui/gitui-0.10.1/cargo-crates/libgit2-sys-0.12.12+1.0.1/libgit2/src/
H A Dmerge.h75 GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2 = (1 << 8), enumerator
/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 Dmerge.h75 GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2 = (1 << 8), enumerator
/dports/devel/cargo-generate/cargo-generate-0.9.0/cargo-crates/libgit2-sys-0.12.22+1.1.0/libgit2/src/
H A Dmerge.h75 GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2 = (1 << 8), enumerator
/dports/sysutils/onefetch/onefetch-2.10.2/cargo-crates/libgit2-sys-0.12.21+1.1.0/libgit2/src/
H A Dmerge.h75 GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2 = (1 << 8), enumerator
/dports/devel/pijul/pijul-1.0.0.a55/cargo-crates/libgit2-sys-0.12.24+1.3.0/libgit2/src/
H A Dmerge.h75 GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2 = (1 << 8), enumerator
/dports/textproc/mdbook-linkcheck/mdbook-linkcheck-0.7.6/cargo-crates/libgit2-sys-0.12.24+1.3.0/libgit2/src/
H A Dmerge.h75 GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2 = (1 << 8), enumerator
/dports/lang/rust/rustc-1.58.1-src/vendor/libgit2-sys/libgit2/src/
H A Dmerge.h75 GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2 = (1 << 8), enumerator
/dports/sysutils/exa/exa-0.10.1/cargo-crates/libgit2-sys-0.12.18+1.1.0/libgit2/src/
H A Dmerge.h75 GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2 = (1 << 8), enumerator
/dports/textproc/bat/bat-0.18.3/cargo-crates/libgit2-sys-0.12.21+1.1.0/libgit2/src/
H A Dmerge.h75 GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2 = (1 << 8), enumerator
/dports/devel/libgit2/libgit2-1.3.0/tests/merge/trees/
H A Dtreediff.c480 GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2, in test_merge_trees_treediff__rename_conflicts()

12