Searched refs:svn_wc_merge_conflict (Results 1 – 5 of 5) sorted by relevance
885 *merge_outcome = svn_wc_merge_conflict; in merge_text_file()1013 *merge_outcome = svn_wc_merge_conflict; in merge_binary_file()1072 *merge_outcome = svn_wc_merge_conflict; /* a conflict happened */ in merge_binary_file()1421 if (*merge_content_outcome == svn_wc_merge_conflict in svn_wc_merge5()
1157 if (merge_outcome == svn_wc_merge_conflict) in tc_editor_alter_file()
3937 *found_conflict = (merge_outcome == svn_wc_merge_conflict); in svn_wc__perform_file_merge()
6874 svn_wc_merge_conflict, enumerator
2165 if (content_outcome == svn_wc_merge_conflict in merge_file_changed()2172 if (content_outcome == svn_wc_merge_conflict) in merge_file_changed()