Searched refs:svn_diff_conflict_display_resolved_modified_latest (Results 1 – 4 of 4) sorted by relevance
256 style = svn_diff_conflict_display_resolved_modified_latest; in svn_diff_file_output_merge()373 style = svn_diff_conflict_display_resolved_modified_latest; in svn_diff_mem_string_output_merge()
910 if (style == svn_diff_conflict_display_resolved_modified_latest) in output_conflict()
2302 if (style == svn_diff_conflict_display_resolved_modified_latest) in output_conflict()
391 svn_diff_conflict_display_resolved_modified_latest, enumerator