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

/freebsd-11-stable/contrib/subversion/subversion/libsvn_client/
H A Dconflicts.c3090 svn_client_conflict_option_sibling_move_file_text_merge;
5059 svn_client_conflict_option_sibling_move_file_text_merge,
9558 * and svn_client_conflict_option_sibling_move_file_text_merge. */
11070 svn_client_conflict_option_sibling_move_file_text_merge,
11961 id != svn_client_conflict_option_sibling_move_file_text_merge &&
12107 id != svn_client_conflict_option_sibling_move_file_text_merge &&
12221 id != svn_client_conflict_option_sibling_move_file_text_merge &&
12389 id != svn_client_conflict_option_sibling_move_file_text_merge &&
/freebsd-11-stable/contrib/subversion/subversion/svn/
H A Dconflict-callbacks.c447 { "m", svn_client_conflict_option_sibling_move_file_text_merge },
/freebsd-11-stable/contrib/subversion/subversion/include/
H A Dsvn_client.h4639 svn_client_conflict_option_sibling_move_file_text_merge, /**< @since New in 1.11. */
4637 svn_client_conflict_option_sibling_move_file_text_merge, /**< @since New in 1.11. */ enumerator in enum:svn_client_conflict_option_id_t

Completed in 211 milliseconds