Searched refs:conflict_new_version (Results 1 – 1 of 1) sorted by relevance
353 svn_wc_conflict_version_t *conflict_old_version, *conflict_new_version; in create_tree_conflict() local456 conflict_new_version = svn_wc_conflict_version_create2( in create_tree_conflict()464 conflict, conflict_old_version, conflict_new_version, in create_tree_conflict()471 conflict, conflict_old_version, conflict_new_version, in create_tree_conflict()