Searched refs:svn_diff_conflict_display_modified_original_latest (Results 1 – 6 of 6) sorted by relevance
231 style = svn_diff_conflict_display_modified_original_latest; in svn_diff_file_output_merge()
922 style == svn_diff_conflict_display_modified_original_latest) in output_conflict()928 if (style == svn_diff_conflict_display_modified_original_latest) in output_conflict()1148 style = svn_diff_conflict_display_modified_original_latest; in svn_diff_mem_string_output_merge()
2281 style == svn_diff_conflict_display_modified_original_latest) in output_conflict()2289 if (style == svn_diff_conflict_display_modified_original_latest) in output_conflict()
394 svn_diff_conflict_display_modified_original_latest, enumerator
424 svn_diff_conflict_display_modified_original_latest, in do_text_merge()
280 svn_diff_conflict_display_modified_original_latest, in merge_prop_conflict()