Home
last modified time | relevance | path

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

12

/dports/devel/libgit2/libgit2-1.3.0/tests/merge/trees/
H A Dtreediff.c452 GIT_MERGE_DIFF_RENAMED_ADDED, in test_merge_trees_treediff__rename_conflicts()
459 GIT_MERGE_DIFF_RENAMED_ADDED, in test_merge_trees_treediff__rename_conflicts()
466 GIT_MERGE_DIFF_RENAMED_ADDED, in test_merge_trees_treediff__rename_conflicts()
473 GIT_MERGE_DIFF_RENAMED_ADDED, in test_merge_trees_treediff__rename_conflicts()
/dports/devel/interactive_rebase_tool/git-interactive-rebase-tool-1.2.1/cargo-crates/libgit2-sys-0.7.11/libgit2/src/
H A Dmerge.h67 GIT_MERGE_DIFF_RENAMED_ADDED = (1 << 6), enumerator
H A Dmerge.c639 conflict->type == GIT_MERGE_DIFF_RENAMED_ADDED) in merge_conflict_resolve_trivial()
722 conflict->type == GIT_MERGE_DIFF_RENAMED_ADDED) in merge_conflict_resolve_one_removed()
774 conflict->type == GIT_MERGE_DIFF_RENAMED_ADDED) in merge_conflict_resolve_one_renamed()
832 conflict->type == GIT_MERGE_DIFF_RENAMED_ADDED) in merge_conflict_can_resolve_contents()
1361 ours_source->type = GIT_MERGE_DIFF_RENAMED_ADDED; in merge_diff_mark_rename_conflict()
1362 target->type = GIT_MERGE_DIFF_RENAMED_ADDED; in merge_diff_mark_rename_conflict()
1376 theirs_source->type = GIT_MERGE_DIFF_RENAMED_ADDED; in merge_diff_mark_rename_conflict()
1377 target->type = GIT_MERGE_DIFF_RENAMED_ADDED; 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.h67 GIT_MERGE_DIFF_RENAMED_ADDED = (1 << 6), enumerator
H A Dmerge.c667 conflict->type == GIT_MERGE_DIFF_RENAMED_ADDED) in merge_conflict_resolve_trivial()
752 conflict->type == GIT_MERGE_DIFF_RENAMED_ADDED) in merge_conflict_resolve_one_removed()
806 conflict->type == GIT_MERGE_DIFF_RENAMED_ADDED) in merge_conflict_resolve_one_renamed()
864 conflict->type == GIT_MERGE_DIFF_RENAMED_ADDED) in merge_conflict_can_resolve_contents()
1390 ours_source->type = GIT_MERGE_DIFF_RENAMED_ADDED; in merge_diff_mark_rename_conflict()
1391 target->type = GIT_MERGE_DIFF_RENAMED_ADDED; in merge_diff_mark_rename_conflict()
1405 theirs_source->type = GIT_MERGE_DIFF_RENAMED_ADDED; in merge_diff_mark_rename_conflict()
1406 target->type = GIT_MERGE_DIFF_RENAMED_ADDED; 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.h67 GIT_MERGE_DIFF_RENAMED_ADDED = (1 << 6), enumerator
H A Dmerge.c677 conflict->type == GIT_MERGE_DIFF_RENAMED_ADDED) in merge_conflict_resolve_trivial()
762 conflict->type == GIT_MERGE_DIFF_RENAMED_ADDED) in merge_conflict_resolve_one_removed()
816 conflict->type == GIT_MERGE_DIFF_RENAMED_ADDED) in merge_conflict_resolve_one_renamed()
877 conflict->type == GIT_MERGE_DIFF_RENAMED_ADDED) in merge_conflict_can_resolve_contents()
1403 ours_source->type = GIT_MERGE_DIFF_RENAMED_ADDED; in merge_diff_mark_rename_conflict()
1404 target->type = GIT_MERGE_DIFF_RENAMED_ADDED; in merge_diff_mark_rename_conflict()
1418 theirs_source->type = GIT_MERGE_DIFF_RENAMED_ADDED; in merge_diff_mark_rename_conflict()
1419 target->type = GIT_MERGE_DIFF_RENAMED_ADDED; 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.h67 GIT_MERGE_DIFF_RENAMED_ADDED = (1 << 6), 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.h67 GIT_MERGE_DIFF_RENAMED_ADDED = (1 << 6), enumerator
/dports/devel/R-cran-git2r/git2r/src/libgit2/src/
H A Dmerge.h67 GIT_MERGE_DIFF_RENAMED_ADDED = (1 << 6), enumerator
/dports/devel/git-delta/delta-0.9.2/cargo-crates/libgit2-sys-0.12.24+1.3.0/libgit2/src/
H A Dmerge.h67 GIT_MERGE_DIFF_RENAMED_ADDED = (1 << 6), enumerator
/dports/sysutils/vector/vector-0.10.0/cargo-crates/libgit2-sys-0.12.7+1.0.0/libgit2/src/
H A Dmerge.h67 GIT_MERGE_DIFF_RENAMED_ADDED = (1 << 6), 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.h67 GIT_MERGE_DIFF_RENAMED_ADDED = (1 << 6), enumerator
/dports/devel/tokei/tokei-12.1.2/cargo-crates/libgit2-sys-0.12.17+1.1.0/libgit2/src/
H A Dmerge.h67 GIT_MERGE_DIFF_RENAMED_ADDED = (1 << 6), enumerator
/dports/devel/gbump/gbump-1.0.1/cargo-crates/libgit2-sys-0.9.1/libgit2/src/
H A Dmerge.h67 GIT_MERGE_DIFF_RENAMED_ADDED = (1 << 6), enumerator
/dports/devel/libgit2/libgit2-1.3.0/src/
H A Dmerge.h67 GIT_MERGE_DIFF_RENAMED_ADDED = (1 << 6), enumerator
/dports/devel/gitui/gitui-0.10.1/cargo-crates/libgit2-sys-0.12.12+1.0.1/libgit2/src/
H A Dmerge.h67 GIT_MERGE_DIFF_RENAMED_ADDED = (1 << 6), 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.h67 GIT_MERGE_DIFF_RENAMED_ADDED = (1 << 6), 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.h67 GIT_MERGE_DIFF_RENAMED_ADDED = (1 << 6), enumerator
/dports/sysutils/onefetch/onefetch-2.10.2/cargo-crates/libgit2-sys-0.12.21+1.1.0/libgit2/src/
H A Dmerge.h67 GIT_MERGE_DIFF_RENAMED_ADDED = (1 << 6), enumerator
/dports/devel/pijul/pijul-1.0.0.a55/cargo-crates/libgit2-sys-0.12.24+1.3.0/libgit2/src/
H A Dmerge.h67 GIT_MERGE_DIFF_RENAMED_ADDED = (1 << 6), 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.h67 GIT_MERGE_DIFF_RENAMED_ADDED = (1 << 6), enumerator
/dports/lang/rust/rustc-1.58.1-src/vendor/libgit2-sys/libgit2/src/
H A Dmerge.h67 GIT_MERGE_DIFF_RENAMED_ADDED = (1 << 6), enumerator
/dports/sysutils/exa/exa-0.10.1/cargo-crates/libgit2-sys-0.12.18+1.1.0/libgit2/src/
H A Dmerge.h67 GIT_MERGE_DIFF_RENAMED_ADDED = (1 << 6), enumerator
/dports/textproc/bat/bat-0.18.3/cargo-crates/libgit2-sys-0.12.21+1.1.0/libgit2/src/
H A Dmerge.h67 GIT_MERGE_DIFF_RENAMED_ADDED = (1 << 6), enumerator

12