Searched refs:conflict_style (Results 1 – 4 of 4) sorted by relevance
284 svn_diff_conflict_display_style_t conflict_style, in svn_diff_file_output_merge2() argument295 conflict_style, in svn_diff_file_output_merge2()
722 svn_diff_conflict_display_style_t conflict_style; member908 svn_diff_conflict_display_style_t style = btn->conflict_style; in output_conflict()1094 btn.conflict_style = style; in svn_diff_mem_string_output_merge3()
2000 svn_diff_conflict_display_style_t conflict_style; member2294 svn_diff_conflict_display_style_t style = file_baton->conflict_style; in output_conflict()2407 baton.conflict_style = style; in svn_diff_file_output_merge3()
732 svn_diff_conflict_display_style_t conflict_style,754 svn_diff_conflict_display_style_t conflict_style,