Home
last modified time | relevance | path

Searched refs:conflict_separator (Results 1 – 25 of 28) sorted by relevance

12

/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() argument
269 conflict_separator, in svn_diff_file_output_merge()
283 const char *conflict_separator, in svn_diff_file_output_merge2() argument
294 conflict_separator, in svn_diff_file_output_merge2()
364 const char *conflict_separator, in svn_diff_mem_string_output_merge() argument
386 conflict_separator, in svn_diff_mem_string_output_merge()
400 const char *conflict_separator, in svn_diff_mem_string_output_merge2() argument
410 conflict_separator, in svn_diff_mem_string_output_merge2()
H A Ddiff_file.c2021 const char *conflict_separator; member
2299 "%s%s", btn->conflict_separator, btn->marker_eol)); in output_conflict_with_context()
2357 file_baton->conflict_separator)); in output_conflict()
2385 const char *conflict_separator, in svn_diff_file_output_merge3() argument
2424 SVN_ERR(svn_utf_cstring_from_utf8(&baton.conflict_separator, in svn_diff_file_output_merge3()
2425 conflict_separator ? conflict_separator in svn_diff_file_output_merge3()
H A Ddiff_memory.c1059 const char *conflict_separator, in svn_diff_mem_string_output_merge3() argument
1114 conflict_separator in svn_diff_mem_string_output_merge3()
1115 ? 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() argument
269 conflict_separator, in svn_diff_file_output_merge()
283 const char *conflict_separator, in svn_diff_file_output_merge2() argument
294 conflict_separator, in svn_diff_file_output_merge2()
364 const char *conflict_separator, in svn_diff_mem_string_output_merge() argument
386 conflict_separator, in svn_diff_mem_string_output_merge()
400 const char *conflict_separator, in svn_diff_mem_string_output_merge2() argument
410 conflict_separator, in svn_diff_mem_string_output_merge2()
H A Ddiff_file.c2021 const char *conflict_separator; member
2299 "%s%s", btn->conflict_separator, btn->marker_eol)); in output_conflict_with_context()
2357 file_baton->conflict_separator)); in output_conflict()
2385 const char *conflict_separator, in svn_diff_file_output_merge3() argument
2424 SVN_ERR(svn_utf_cstring_from_utf8(&baton.conflict_separator, in svn_diff_file_output_merge3()
2425 conflict_separator ? conflict_separator in svn_diff_file_output_merge3()
H A Ddiff_memory.c1059 const char *conflict_separator, in svn_diff_mem_string_output_merge3() argument
1114 conflict_separator in svn_diff_mem_string_output_merge3()
1115 ? 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() argument
269 conflict_separator, in svn_diff_file_output_merge()
283 const char *conflict_separator, in svn_diff_file_output_merge2() argument
294 conflict_separator, in svn_diff_file_output_merge2()
364 const char *conflict_separator, in svn_diff_mem_string_output_merge() argument
386 conflict_separator, in svn_diff_mem_string_output_merge()
400 const char *conflict_separator, in svn_diff_mem_string_output_merge2() argument
410 conflict_separator, in svn_diff_mem_string_output_merge2()
H A Ddiff_file.c2021 const char *conflict_separator; member
2299 "%s%s", btn->conflict_separator, btn->marker_eol)); in output_conflict_with_context()
2357 file_baton->conflict_separator)); in output_conflict()
2385 const char *conflict_separator, in svn_diff_file_output_merge3() argument
2424 SVN_ERR(svn_utf_cstring_from_utf8(&baton.conflict_separator, in svn_diff_file_output_merge3()
2425 conflict_separator ? conflict_separator in svn_diff_file_output_merge3()
H A Ddiff_memory.c1059 const char *conflict_separator, in svn_diff_mem_string_output_merge3() argument
1114 conflict_separator in svn_diff_mem_string_output_merge3()
1115 ? 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() argument
269 conflict_separator, in svn_diff_file_output_merge()
283 const char *conflict_separator, in svn_diff_file_output_merge2() argument
294 conflict_separator, in svn_diff_file_output_merge2()
364 const char *conflict_separator, in svn_diff_mem_string_output_merge() argument
386 conflict_separator, in svn_diff_mem_string_output_merge()
400 const char *conflict_separator, in svn_diff_mem_string_output_merge2() argument
410 conflict_separator, in svn_diff_mem_string_output_merge2()
H A Ddiff_file.c2021 const char *conflict_separator; member
2299 "%s%s", btn->conflict_separator, btn->marker_eol)); in output_conflict_with_context()
2357 file_baton->conflict_separator)); in output_conflict()
2385 const char *conflict_separator, in svn_diff_file_output_merge3() argument
2424 SVN_ERR(svn_utf_cstring_from_utf8(&baton.conflict_separator, in svn_diff_file_output_merge3()
2425 conflict_separator ? conflict_separator in svn_diff_file_output_merge3()
H A Ddiff_memory.c1059 const char *conflict_separator, in svn_diff_mem_string_output_merge3() argument
1114 conflict_separator in svn_diff_mem_string_output_merge3()
1115 ? conflict_separator in svn_diff_mem_string_output_merge3()
/dports/java/java-subversion/subversion-1.14.1/subversion/include/
H A Dsvn_diff.h731 const char *conflict_separator,
753 const char *conflict_separator,
782 const char *conflict_separator,
961 const char *conflict_separator,
983 const char *conflict_separator,
1011 const char *conflict_separator,
/dports/devel/py-subversion/subversion-1.14.1/subversion/include/
H A Dsvn_diff.h731 const char *conflict_separator,
753 const char *conflict_separator,
782 const char *conflict_separator,
961 const char *conflict_separator,
983 const char *conflict_separator,
1011 const char *conflict_separator,
/dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/include/
H A Dsvn_diff.h731 const char *conflict_separator,
753 const char *conflict_separator,
782 const char *conflict_separator,
961 const char *conflict_separator,
983 const char *conflict_separator,
1011 const char *conflict_separator,
/dports/devel/p5-subversion/subversion-1.14.1/subversion/include/
H A Dsvn_diff.h731 const char *conflict_separator,
753 const char *conflict_separator,
782 const char *conflict_separator,
961 const char *conflict_separator,
983 const char *conflict_separator,
1011 const char *conflict_separator,
/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
199 conflict_separator.c_str(), in Java_org_apache_subversion_javahl_util_DiffLib_nativeFileMerge()
/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
199 conflict_separator.c_str(), in Java_org_apache_subversion_javahl_util_DiffLib_nativeFileMerge()
/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
199 conflict_separator.c_str(), in Java_org_apache_subversion_javahl_util_DiffLib_nativeFileMerge()
/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
199 conflict_separator.c_str(), in Java_org_apache_subversion_javahl_util_DiffLib_nativeFileMerge()
/dports/java/java-subversion/subversion-1.14.1/subversion/bindings/swig/ruby/svn/
H A Dcore.rb380 conflict_latest=nil, conflict_separator=nil, argument
388 conflict_latest, conflict_separator,
/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
388 conflict_latest, conflict_separator,
/dports/devel/p5-subversion/subversion-1.14.1/subversion/bindings/swig/ruby/svn/
H A Dcore.rb380 conflict_latest=nil, conflict_separator=nil, argument
388 conflict_latest, conflict_separator,
/dports/devel/py-subversion/subversion-1.14.1/subversion/bindings/swig/ruby/svn/
H A Dcore.rb380 conflict_latest=nil, conflict_separator=nil, argument
388 conflict_latest, conflict_separator,
/dports/java/java-subversion/subversion-1.14.1/subversion/bindings/swig/
H A Dcore.i372 const char *conflict_separator,

12