Searched refs:diff_allowed (Results 1 – 1 of 1) sorted by relevance
887 svn_boolean_t diff_allowed = FALSE; in handle_text_conflict() local941 diff_allowed = TRUE; in handle_text_conflict()954 if (diff_allowed) in handle_text_conflict()1029 if (! diff_allowed || ! my_abspath) in handle_text_conflict()1190 && ! knows_something && diff_allowed) in handle_text_conflict()