Searched refs:display_resolved_conflicts (Results 1 – 3 of 3) sorted by relevance
221 svn_boolean_t display_resolved_conflicts, in svn_diff_file_output_merge() argument227 if (display_resolved_conflicts) in svn_diff_file_output_merge()
1138 svn_boolean_t display_resolved_conflicts, in svn_diff_mem_string_output_merge() argument1144 if (display_resolved_conflicts) in svn_diff_mem_string_output_merge()
700 svn_boolean_t display_resolved_conflicts,846 svn_boolean_t display_resolved_conflicts,