Searched refs:svn_wc_merge_unchanged (Results 1 – 4 of 4) sorted by relevance
708 *merge_outcome = svn_wc_merge_unchanged; in merge_file_trivial()785 *merge_outcome = svn_wc_merge_unchanged; in merge_file_trivial()934 *merge_outcome = same ? svn_wc_merge_unchanged : svn_wc_merge_merged; in merge_text_file()937 if (*merge_outcome != svn_wc_merge_unchanged && ! dry_run) in merge_text_file()
3845 enum svn_wc_merge_outcome_t merge_outcome = svn_wc_merge_unchanged; in svn_wc__perform_file_merge()
6866 svn_wc_merge_unchanged, enumerator
2132 && content_outcome != svn_wc_merge_unchanged) in merge_file_changed()