Searched refs:resolution_text (Results 1 – 1 of 1) sorted by relevance
78 svn_client_conflict_option_id_t resolution_text; member6434 conflict->resolution_text = option_id; in resolve_text_conflict()12800 return conflict->resolution_text; in svn_client_conflict_text_get_resolution()13262 (*conflict)->resolution_text = svn_client_conflict_option_unspecified; in svn_client_conflict_get()