Searched refs:conflicts_only (Results 1 – 2 of 2) sorted by relevance
1067 svn_boolean_t conflicts_only = in svn_diff_mem_string_output_merge3() local1069 const svn_diff_output_fns_t *vtable = conflicts_only in svn_diff_mem_string_output_merge3()1075 if (conflicts_only) in svn_diff_mem_string_output_merge3()1125 if (conflicts_only) in svn_diff_mem_string_output_merge3()
2398 svn_boolean_t conflicts_only = in svn_diff_file_output_merge3() local2403 if (conflicts_only) in svn_diff_file_output_merge3()2487 if (conflicts_only) in svn_diff_file_output_merge3()