Searched refs:svn_client_conflict_option_incoming_added_dir_replace_and_merge (Results 1 - 3 of 3) sorted by relevance

/freebsd-11-stable/contrib/subversion/subversion/svn/
H A Dconflict-callbacks.c432 { "M", svn_client_conflict_option_incoming_added_dir_replace_and_merge },
/freebsd-11-stable/contrib/subversion/subversion/include/
H A Dsvn_client.h4624 svn_client_conflict_option_incoming_added_dir_replace_and_merge,
4622 svn_client_conflict_option_incoming_added_dir_replace_and_merge, enumerator in enum:svn_client_conflict_option_id_t
/freebsd-11-stable/contrib/subversion/subversion/libsvn_client/
H A Dconflicts.c10547 svn_client_conflict_option_incoming_added_dir_replace_and_merge,

Completed in 406 milliseconds