Searched refs:merged_value (Results 1 – 2 of 2) sorted by relevance
1357 && (!result->merged_file && !result->merged_value)) in generate_propconflict()1363 if (result->merged_value) in generate_propconflict()1364 new_value = result->merged_value; in generate_propconflict()2372 const svn_string_t *merged_value, in resolve_prop_conflict_on_node() argument2458 if ((merged_file || merged_value) && conflicted_propname[0] != '\0') in resolve_prop_conflict_on_node()2462 if (!merged_value) in resolve_prop_conflict_on_node()2472 merged_value = merged_propval; in resolve_prop_conflict_on_node()2474 svn_hash_sets(resolve_from, conflicted_propname, merged_value); in resolve_prop_conflict_on_node()3069 ? result->merged_value in conflict_status_walker()
2194 const svn_string_t *merged_value; member