Searched refs:resolved_allowed (Results 1 – 1 of 1) sorted by relevance
1294 svn_boolean_t resolved_allowed = FALSE; in handle_one_prop_conflict() local1336 if (resolved_allowed) in handle_one_prop_conflict()1369 resolved_allowed = (merged_propval != NULL); in handle_one_prop_conflict()1373 if (! resolved_allowed) in handle_one_prop_conflict()