Searched refs:conflict_original (Results 1 – 4 of 4) sorted by relevance
| /NextBSD/contrib/subversion/subversion/libsvn_diff/ |
| HD | deprecated.c | 244 const char *conflict_original, in svn_diff_file_output_merge() argument
266 conflict_original, in svn_diff_file_output_merge()
280 const char *conflict_original, in svn_diff_file_output_merge2() argument
291 conflict_original, in svn_diff_file_output_merge2()
361 const char *conflict_original, in svn_diff_mem_string_output_merge() argument
383 conflict_original, in svn_diff_mem_string_output_merge()
397 const char *conflict_original, in svn_diff_mem_string_output_merge2() argument
407 conflict_original, in svn_diff_mem_string_output_merge2()
|
| HD | diff_file.c | 1994 const char *conflict_original; member
2268 SVN_ERR(output_conflict_with_context_marker(btn, btn->conflict_original, in output_conflict_with_context()
2325 file_baton->conflict_original)); in output_conflict()
2356 const char *conflict_original, in svn_diff_file_output_merge3() argument
2393 SVN_ERR(svn_utf_cstring_from_utf8(&baton.conflict_original, in svn_diff_file_output_merge3()
2394 conflict_original ? conflict_original in svn_diff_file_output_merge3()
|
| HD | diff_memory.c | 1062 const char *conflict_original, in svn_diff_mem_string_output_merge3() argument
1115 conflict_original in svn_diff_mem_string_output_merge3()
1116 ? conflict_original in svn_diff_mem_string_output_merge3()
|
| /NextBSD/contrib/subversion/subversion/include/ |
| HD | svn_diff.h | 728 const char *conflict_original,
750 const char *conflict_original,
779 const char *conflict_original,
958 const char *conflict_original,
980 const char *conflict_original,
1008 const char *conflict_original,
|