Home
last modified time | relevance | path

Searched refs:svn_diff_conflict_display_modified (Results 1 – 4 of 4) sorted by relevance

/freebsd-13.1/contrib/subversion/subversion/include/
H A Dsvn_diff.h398 svn_diff_conflict_display_modified, enumerator
/freebsd-13.1/contrib/subversion/subversion/libsvn_diff/
H A Ddiff_memory.c932 else if (style == svn_diff_conflict_display_modified) in output_conflict()
H A Ddiff_file.c2366 else if (style == svn_diff_conflict_display_modified) in output_conflict()
/freebsd-13.1/contrib/subversion/subversion/libsvn_wc/
H A Dconflicts.c1676 : svn_diff_conflict_display_modified; in build_text_conflict_resolve_items()