Searched refs:display_original_in_conflict (Results 1 – 2 of 2) sorted by relevance
248 svn_boolean_t display_original_in_conflict, in svn_diff_file_output_merge() argument258 if (display_original_in_conflict) in svn_diff_file_output_merge()365 svn_boolean_t display_original_in_conflict, in svn_diff_mem_string_output_merge() argument375 if (display_original_in_conflict) in svn_diff_mem_string_output_merge()
783 svn_boolean_t display_original_in_conflict,1012 svn_boolean_t display_original_in_conflict,