Searched refs:edit_prop_conflict (Results 1 – 4 of 4) sorted by relevance
334 edit_prop_conflict(const svn_string_t **merged_propval, in edit_prop_conflict() function1365 SVN_ERR(edit_prop_conflict(&merged_propval, in handle_one_prop_conflict()