Home
last modified time | relevance | path

Searched defs:conflict_style (Results 1 – 25 of 43) sorted by relevance

12

/dports/java/java-subversion/subversion-1.14.1/tools/diff/
H A Ddiff3.c43 svn_diff_conflict_display_style_t conflict_style, in do_diff3()
88 svn_diff_conflict_display_style_t conflict_style in main() local
/dports/devel/py-subversion/subversion-1.14.1/tools/diff/
H A Ddiff3.c43 svn_diff_conflict_display_style_t conflict_style, in do_diff3()
88 svn_diff_conflict_display_style_t conflict_style in main() local
/dports/security/subversion-gnome-keyring/subversion-1.14.1/tools/diff/
H A Ddiff3.c43 svn_diff_conflict_display_style_t conflict_style, in do_diff3()
88 svn_diff_conflict_display_style_t conflict_style in main() local
/dports/graphics/osg34/OpenSceneGraph-OpenSceneGraph-3.4.1/src/osgGA/
H A DTerrainManipulator.cpp39 /** Sets the manipulator rotation mode. RotationMode is now deprecated by in do_diff3()
90 // need to reintersect with the terrain in main()
91 const BoundingSphere& bs = _node->getBound(); in main()
/dports/devel/patch/patch-2.7.6/src/
H A Dcommon.h216 enum conflict_style { MERGE_MERGE, MERGE_DIFF3 }; enum
217 XTERN enum conflict_style conflict_style; variable
/dports/java/java-subversion/subversion-1.14.1/subversion/libsvn_diff/
H A Ddeprecated.c284 svn_diff_conflict_display_style_t conflict_style, in svn_diff_file_output_merge2()
H A Ddiff_memory.c722 svn_diff_conflict_display_style_t conflict_style; member
H A Ddiff_file.c2026 svn_diff_conflict_display_style_t conflict_style; member
/dports/devel/py-subversion/subversion-1.14.1/subversion/libsvn_diff/
H A Ddeprecated.c284 svn_diff_conflict_display_style_t conflict_style, in svn_diff_file_output_merge2()
H A Ddiff_memory.c722 svn_diff_conflict_display_style_t conflict_style; member
/dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/libsvn_diff/
H A Ddeprecated.c284 svn_diff_conflict_display_style_t conflict_style, in svn_diff_file_output_merge2()
H A Ddiff_memory.c722 svn_diff_conflict_display_style_t conflict_style; member
/dports/devel/p5-subversion/subversion-1.14.1/subversion/libsvn_diff/
H A Ddeprecated.c284 svn_diff_conflict_display_style_t conflict_style, in svn_diff_file_output_merge2()
H A Ddiff_memory.c722 svn_diff_conflict_display_style_t conflict_style; member
/dports/devel/git-svn/git-2.34.1/builtin/
H A Dclean.c84 int (*fn)(void);
85 };
/dports/devel/cgit/cgit-1.2.3/git/builtin/
H A Dcheckout.c82 char *conflict_style; member
/dports/devel/git-p4/git-2.34.1/builtin/
H A Dcheckout.c84 char *conflict_style; member
/dports/devel/git/git-2.34.1/builtin/
H A Dcheckout.c84 char *conflict_style; member
/dports/devel/git-gui/git-2.34.1/builtin/
H A Dcheckout.c84 char *conflict_style; member
/dports/devel/git-cvs/git-2.34.1/builtin/
H A Dcheckout.c84 char *conflict_style; member
/dports/devel/interactive_rebase_tool/git-interactive-rebase-tool-1.2.1/cargo-crates/libgit2-sys-0.7.11/libgit2/src/
H A Dcheckout.c2486 git_config_entry *conflict_style = NULL; in checkout_data_init() local
/dports/devel/git-absorb/git-absorb-0.6.6/cargo-crates/libgit2-sys-0.12.13+1.0.1/libgit2/src/
H A Dcheckout.c2465 git_config_entry *conflict_style = NULL; in checkout_data_init() local
/dports/devel/R-cran-git2r/git2r/src/libgit2/src/
H A Dcheckout.c2495 git_config_entry *conflict_style = NULL; in checkout_data_init() local
/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 Dcheckout.c2467 git_config_entry *conflict_style = NULL; in checkout_data_init() local
/dports/devel/tokei/tokei-12.1.2/cargo-crates/libgit2-sys-0.12.17+1.1.0/libgit2/src/
H A Dcheckout.c2467 git_config_entry *conflict_style = NULL; in checkout_data_init() local

12