| /dports/java/java-subversion/subversion-1.14.1/tools/diff/ |
| H A D | diff3.c | 41 const char *conflict_modified, in do_diff3() argument
57 conflict_modified, in do_diff3()
106 const char *conflict_modified = NULL; in main() local
138 if (!conflict_modified) in main()
139 conflict_modified = apr_pstrcat(pool, "<<<<<<< ", arg, SVN_VA_NULL); in main()
175 conflict_original, conflict_modified, conflict_latest, in main()
|
| /dports/devel/py-subversion/subversion-1.14.1/tools/diff/ |
| H A D | diff3.c | 41 const char *conflict_modified, in do_diff3() argument
57 conflict_modified, in do_diff3()
106 const char *conflict_modified = NULL; in main() local
138 if (!conflict_modified) in main()
139 conflict_modified = apr_pstrcat(pool, "<<<<<<< ", arg, SVN_VA_NULL); in main()
175 conflict_original, conflict_modified, conflict_latest, in main()
|
| /dports/security/subversion-gnome-keyring/subversion-1.14.1/tools/diff/ |
| H A D | diff3.c | 41 const char *conflict_modified, in do_diff3() argument
57 conflict_modified, in do_diff3()
106 const char *conflict_modified = NULL; in main() local
138 if (!conflict_modified) in main()
139 conflict_modified = apr_pstrcat(pool, "<<<<<<< ", arg, SVN_VA_NULL); in main()
175 conflict_original, conflict_modified, conflict_latest, in main()
|
| /dports/devel/p5-subversion/subversion-1.14.1/tools/diff/ |
| H A D | diff3.c | 41 const char *conflict_modified, in do_diff()
57 conflict_modified, in do_diff()
106 const char *conflict_modified = NULL; in main()
138 if (!conflict_modified) in main()
139 conflict_modified = apr_pstrcat(pool, "<<<<<<< ", arg, SVN_VA_NULL); in main()
175 conflict_original, conflict_modified, conflict_latest, in main()
|
| /dports/java/java-subversion/subversion-1.14.1/subversion/libsvn_diff/ |
| H A D | deprecated.c | 245 const char *conflict_modified, in svn_diff_file_output_merge() argument
267 conflict_modified, in svn_diff_file_output_merge()
281 const char *conflict_modified, in svn_diff_file_output_merge2() argument
292 conflict_modified, in svn_diff_file_output_merge2()
362 const char *conflict_modified, in svn_diff_mem_string_output_merge() argument
384 conflict_modified, in svn_diff_mem_string_output_merge()
398 const char *conflict_modified, in svn_diff_mem_string_output_merge2() argument
408 conflict_modified, in svn_diff_mem_string_output_merge2()
|
| H A D | diff_file.c | 2019 const char *conflict_modified; member
2290 SVN_ERR(output_conflict_with_context_marker(btn, btn->conflict_modified, in output_conflict_with_context()
2343 file_baton->conflict_modified)); in output_conflict()
2383 const char *conflict_modified, in svn_diff_file_output_merge3() argument
2414 SVN_ERR(svn_utf_cstring_from_utf8(&baton.conflict_modified, in svn_diff_file_output_merge3()
2415 conflict_modified ? conflict_modified in svn_diff_file_output_merge3()
|
| H A D | diff_memory.c | 1057 const char *conflict_modified, in svn_diff_mem_string_output_merge3() argument
1104 conflict_modified in svn_diff_mem_string_output_merge3()
1105 ? conflict_modified in svn_diff_mem_string_output_merge3()
|
| /dports/devel/py-subversion/subversion-1.14.1/subversion/libsvn_diff/ |
| H A D | deprecated.c | 245 const char *conflict_modified, in svn_diff_file_output_merge() argument
267 conflict_modified, in svn_diff_file_output_merge()
281 const char *conflict_modified, in svn_diff_file_output_merge2() argument
292 conflict_modified, in svn_diff_file_output_merge2()
362 const char *conflict_modified, in svn_diff_mem_string_output_merge() argument
384 conflict_modified, in svn_diff_mem_string_output_merge()
398 const char *conflict_modified, in svn_diff_mem_string_output_merge2() argument
408 conflict_modified, in svn_diff_mem_string_output_merge2()
|
| H A D | diff_file.c | 2019 const char *conflict_modified; member
2290 SVN_ERR(output_conflict_with_context_marker(btn, btn->conflict_modified, in output_conflict_with_context()
2343 file_baton->conflict_modified)); in output_conflict()
2383 const char *conflict_modified, in svn_diff_file_output_merge3() argument
2414 SVN_ERR(svn_utf_cstring_from_utf8(&baton.conflict_modified, in svn_diff_file_output_merge3()
2415 conflict_modified ? conflict_modified in svn_diff_file_output_merge3()
|
| H A D | diff_memory.c | 1057 const char *conflict_modified, in svn_diff_mem_string_output_merge3() argument
1104 conflict_modified in svn_diff_mem_string_output_merge3()
1105 ? conflict_modified in svn_diff_mem_string_output_merge3()
|
| /dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/libsvn_diff/ |
| H A D | deprecated.c | 245 const char *conflict_modified, in svn_diff_file_output_merge() argument
267 conflict_modified, in svn_diff_file_output_merge()
281 const char *conflict_modified, in svn_diff_file_output_merge2() argument
292 conflict_modified, in svn_diff_file_output_merge2()
362 const char *conflict_modified, in svn_diff_mem_string_output_merge() argument
384 conflict_modified, in svn_diff_mem_string_output_merge()
398 const char *conflict_modified, in svn_diff_mem_string_output_merge2() argument
408 conflict_modified, in svn_diff_mem_string_output_merge2()
|
| H A D | diff_file.c | 2019 const char *conflict_modified; member
2290 SVN_ERR(output_conflict_with_context_marker(btn, btn->conflict_modified, in output_conflict_with_context()
2343 file_baton->conflict_modified)); in output_conflict()
2383 const char *conflict_modified, in svn_diff_file_output_merge3() argument
2414 SVN_ERR(svn_utf_cstring_from_utf8(&baton.conflict_modified, in svn_diff_file_output_merge3()
2415 conflict_modified ? conflict_modified in svn_diff_file_output_merge3()
|
| H A D | diff_memory.c | 1057 const char *conflict_modified, in svn_diff_mem_string_output_merge3() argument
1104 conflict_modified in svn_diff_mem_string_output_merge3()
1105 ? conflict_modified in svn_diff_mem_string_output_merge3()
|
| /dports/devel/p5-subversion/subversion-1.14.1/subversion/libsvn_diff/ |
| H A D | deprecated.c | 245 const char *conflict_modified, in svn_diff_file_output_merge() argument
267 conflict_modified, in svn_diff_file_output_merge()
281 const char *conflict_modified, in svn_diff_file_output_merge2() argument
292 conflict_modified, in svn_diff_file_output_merge2()
362 const char *conflict_modified, in svn_diff_mem_string_output_merge() argument
384 conflict_modified, in svn_diff_mem_string_output_merge()
398 const char *conflict_modified, in svn_diff_mem_string_output_merge2() argument
408 conflict_modified, in svn_diff_mem_string_output_merge2()
|
| H A D | diff_file.c | 2019 const char *conflict_modified; member
2290 SVN_ERR(output_conflict_with_context_marker(btn, btn->conflict_modified, in output_conflict_with_context()
2343 file_baton->conflict_modified)); in output_conflict()
2383 const char *conflict_modified, in svn_diff_file_output_merge3() argument
2414 SVN_ERR(svn_utf_cstring_from_utf8(&baton.conflict_modified, in svn_diff_file_output_merge3()
2415 conflict_modified ? conflict_modified in svn_diff_file_output_merge3()
|
| H A D | diff_memory.c | 1057 const char *conflict_modified, in svn_diff_mem_string_output_merge3() argument
1104 conflict_modified in svn_diff_mem_string_output_merge3()
1105 ? conflict_modified in svn_diff_mem_string_output_merge3()
|
| /dports/java/java-subversion/subversion-1.14.1/subversion/include/ |
| H A D | svn_diff.h | 729 const char *conflict_modified,
751 const char *conflict_modified,
780 const char *conflict_modified,
959 const char *conflict_modified,
981 const char *conflict_modified,
1009 const char *conflict_modified,
|
| /dports/devel/py-subversion/subversion-1.14.1/subversion/include/ |
| H A D | svn_diff.h | 729 const char *conflict_modified,
751 const char *conflict_modified,
780 const char *conflict_modified,
959 const char *conflict_modified,
981 const char *conflict_modified,
1009 const char *conflict_modified,
|
| /dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/include/ |
| H A D | svn_diff.h | 729 const char *conflict_modified,
751 const char *conflict_modified,
780 const char *conflict_modified,
959 const char *conflict_modified,
981 const char *conflict_modified,
1009 const char *conflict_modified,
|
| /dports/devel/p5-subversion/subversion-1.14.1/subversion/include/ |
| H A D | svn_diff.h | 729 const char *conflict_modified,
751 const char *conflict_modified,
780 const char *conflict_modified,
959 const char *conflict_modified,
981 const char *conflict_modified,
1009 const char *conflict_modified,
|
| /dports/java/java-subversion/subversion-1.14.1/subversion/bindings/javahl/native/ |
| H A D | org_apache_subversion_javahl_util_DiffLib.cpp | 179 JNIStringHolder conflict_modified(jconflict_modified); in Java_org_apache_subversion_javahl_util_DiffLib_nativeFileMerge() local
197 conflict_modified.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 D | org_apache_subversion_javahl_util_DiffLib.cpp | 179 JNIStringHolder conflict_modified(jconflict_modified); in Java_org_apache_subversion_javahl_util_DiffLib_nativeFileMerge() local
197 conflict_modified.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 D | org_apache_subversion_javahl_util_DiffLib.cpp | 179 JNIStringHolder conflict_modified(jconflict_modified); in Java_org_apache_subversion_javahl_util_DiffLib_nativeFileMerge() local
197 conflict_modified.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 D | org_apache_subversion_javahl_util_DiffLib.cpp | 179 JNIStringHolder conflict_modified(jconflict_modified); in Java_org_apache_subversion_javahl_util_DiffLib_nativeFileMerge() local
197 conflict_modified.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 D | core.rb | 379 def merge(conflict_original=nil, conflict_modified=nil, argument
387 conflict_original, conflict_modified,
|