Home
last modified time | relevance | path

Searched defs:conflict_separator (Results 1 – 20 of 20) sorted by relevance

/dports/java/java-subversion/subversion-1.14.1/subversion/libsvn_diff/
H A Ddeprecated.c247 const char *conflict_separator, in svn_diff_file_output_merge()
283 const char *conflict_separator, in svn_diff_file_output_merge2()
364 const char *conflict_separator, in svn_diff_mem_string_output_merge()
400 const char *conflict_separator, in svn_diff_mem_string_output_merge2()
H A Ddiff_file.c2021 const char *conflict_separator; member
2385 const char *conflict_separator, in svn_diff_file_output_merge3()
H A Ddiff_memory.c1059 const char *conflict_separator, in svn_diff_mem_string_output_merge3()
/dports/devel/py-subversion/subversion-1.14.1/subversion/libsvn_diff/
H A Ddeprecated.c247 const char *conflict_separator, in svn_diff_file_output_merge()
283 const char *conflict_separator, in svn_diff_file_output_merge2()
364 const char *conflict_separator, in svn_diff_mem_string_output_merge()
400 const char *conflict_separator, in svn_diff_mem_string_output_merge2()
H A Ddiff_file.c2021 const char *conflict_separator; member
2385 const char *conflict_separator, in svn_diff_file_output_merge3()
H A Ddiff_memory.c1059 const char *conflict_separator, in svn_diff_mem_string_output_merge3()
/dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/libsvn_diff/
H A Ddeprecated.c247 const char *conflict_separator, in svn_diff_file_output_merge()
283 const char *conflict_separator, in svn_diff_file_output_merge2()
364 const char *conflict_separator, in svn_diff_mem_string_output_merge()
400 const char *conflict_separator, in svn_diff_mem_string_output_merge2()
H A Ddiff_file.c2021 const char *conflict_separator; member
2385 const char *conflict_separator, in svn_diff_file_output_merge3()
H A Ddiff_memory.c1059 const char *conflict_separator, in svn_diff_mem_string_output_merge3()
/dports/devel/p5-subversion/subversion-1.14.1/subversion/libsvn_diff/
H A Ddeprecated.c247 const char *conflict_separator, in svn_diff_file_output_merge()
283 const char *conflict_separator, in svn_diff_file_output_merge2()
364 const char *conflict_separator, in svn_diff_mem_string_output_merge()
400 const char *conflict_separator, in svn_diff_mem_string_output_merge2()
H A Ddiff_file.c2021 const char *conflict_separator; member
2385 const char *conflict_separator, in svn_diff_file_output_merge3()
H A Ddiff_memory.c1059 const char *conflict_separator, in svn_diff_mem_string_output_merge3()
/dports/java/java-subversion/subversion-1.14.1/subversion/bindings/javahl/native/
H A Dorg_apache_subversion_javahl_util_DiffLib.cpp187 JNIStringHolder conflict_separator(jconflict_separator); in Java_org_apache_subversion_javahl_util_DiffLib_nativeFileMerge() local
/dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/bindings/javahl/native/
H A Dorg_apache_subversion_javahl_util_DiffLib.cpp187 JNIStringHolder conflict_separator(jconflict_separator); in Java_org_apache_subversion_javahl_util_DiffLib_nativeFileMerge() local
/dports/devel/p5-subversion/subversion-1.14.1/subversion/bindings/javahl/native/
H A Dorg_apache_subversion_javahl_util_DiffLib.cpp187 JNIStringHolder conflict_separator(jconflict_separator); in Java_org_apache_subversion_javahl_util_DiffLib_nativeFileMerge() local
/dports/devel/py-subversion/subversion-1.14.1/subversion/bindings/javahl/native/
H A Dorg_apache_subversion_javahl_util_DiffLib.cpp187 JNIStringHolder conflict_separator(jconflict_separator); in Java_org_apache_subversion_javahl_util_DiffLib_nativeFileMerge() local
/dports/java/java-subversion/subversion-1.14.1/subversion/bindings/swig/ruby/svn/
H A Dcore.rb380 conflict_latest=nil, conflict_separator=nil, argument
/dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/bindings/swig/ruby/svn/
H A Dcore.rb380 conflict_latest=nil, conflict_separator=nil, argument
/dports/devel/p5-subversion/subversion-1.14.1/subversion/bindings/swig/ruby/svn/
H A Dcore.rb380 conflict_latest=nil, conflict_separator=nil, argument
/dports/devel/py-subversion/subversion-1.14.1/subversion/bindings/swig/ruby/svn/
H A Dcore.rb380 conflict_latest=nil, conflict_separator=nil, argument