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

/freebsd-11-stable/contrib/subversion/subversion/libsvn_client/
H A Dconflicts.c8866 SVN_ERR_ASSERT(option_id == svn_client_conflict_option_both_moved_file_merge);
11164 SVN_ERR_ASSERT(option_id == svn_client_conflict_option_both_moved_file_merge);
11788 options, conflict, svn_client_conflict_option_both_moved_file_merge,
11963 id != svn_client_conflict_option_both_moved_file_merge &&
12109 id != svn_client_conflict_option_both_moved_file_merge &&
12223 id != svn_client_conflict_option_both_moved_file_merge &&
12391 id != svn_client_conflict_option_both_moved_file_merge &&
12504 if (id == svn_client_conflict_option_both_moved_file_merge)
/freebsd-11-stable/contrib/subversion/subversion/svn/
H A Dconflict-callbacks.c451 { "m", svn_client_conflict_option_both_moved_file_merge },
/freebsd-11-stable/contrib/subversion/subversion/include/
H A Dsvn_client.h4643 svn_client_conflict_option_both_moved_file_merge, /*< @since New in 1.12 */
4641 svn_client_conflict_option_both_moved_file_merge, /*< @since New in 1.12 */ enumerator in enum:svn_client_conflict_option_id_t

Completed in 139 milliseconds