Searched refs:conflict_modified (Results 1 – 4 of 4) sorted by relevance
| /NextBSD/contrib/subversion/subversion/libsvn_diff/ |
| HD | 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()
|
| HD | diff_file.c | 1993 const char *conflict_modified; member
2264 SVN_ERR(output_conflict_with_context_marker(btn, btn->conflict_modified, in output_conflict_with_context()
2317 file_baton->conflict_modified)); in output_conflict()
2357 const char *conflict_modified, in svn_diff_file_output_merge3() argument
2388 SVN_ERR(svn_utf_cstring_from_utf8(&baton.conflict_modified, in svn_diff_file_output_merge3()
2389 conflict_modified ? conflict_modified in svn_diff_file_output_merge3()
|
| HD | diff_memory.c | 1063 const char *conflict_modified, in svn_diff_mem_string_output_merge3() argument
1110 conflict_modified in svn_diff_mem_string_output_merge3()
1111 ? conflict_modified in svn_diff_mem_string_output_merge3()
|
| /NextBSD/contrib/subversion/subversion/include/ |
| HD | 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,
|