Searched refs:display_resolved_conflicts (Results 1 – 2 of 2) sorted by relevance
249 svn_boolean_t display_resolved_conflicts, in svn_diff_file_output_merge() argument255 if (display_resolved_conflicts) in svn_diff_file_output_merge()366 svn_boolean_t display_resolved_conflicts, in svn_diff_mem_string_output_merge() argument372 if (display_resolved_conflicts) in svn_diff_mem_string_output_merge()
784 svn_boolean_t display_resolved_conflicts,1013 svn_boolean_t display_resolved_conflicts,