Searched defs:merged_path (Results 1 - 5 of 5) sorted by path
| /freebsd-11-stable/contrib/subversion/subversion/svn/ |
| H A D | file-merge.c | 860 svn_cl__merge_file(svn_boolean_t *remains_in_conflict, const char *base_path, const char *their_path, const char *my_path, const char *merged_path, const char *wc_path, const char *path_prefix, const char *editor_cmd, apr_hash_t *config, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *scratch_pool) argument
|
| H A D | blame-cmd.c | 57 blame_receiver_xml(void *baton, apr_int64_t line_no, svn_revnum_t revision, apr_hash_t *rev_props, svn_revnum_t merged_revision, apr_hash_t *merged_rev_props, const char *merged_path, const svn_string_t *line, svn_boolean_t local_change, apr_pool_t *pool) argument
171 blame_receiver(void *baton, apr_int64_t line_no, svn_revnum_t revision, apr_hash_t *rev_props, svn_revnum_t merged_revision, apr_hash_t *merged_rev_props, const char *merged_path, const svn_string_t *line, svn_boolean_t local_change, apr_pool_t *pool) argument
|
| H A D | util.c | 110 svn_cl__merge_file_externally(const char *base_path, const char *their_path, const char *my_path, const char *merged_path, const char *wc_path, apr_hash_t *config, svn_boolean_t *remains_in_conflict, apr_pool_t *pool) argument
|
| /freebsd-11-stable/contrib/subversion/subversion/libsvn_client/ |
| H A D | blame.c | 920 const char *merged_path; local
|
| H A D | deprecated.c | 177 blame_wrapper_receiver3(void *baton, apr_int64_t line_no, svn_revnum_t revision, apr_hash_t *rev_props, svn_revnum_t merged_revision, apr_hash_t *merged_rev_props, const char *merged_path, const svn_string_t *line, svn_boolean_t local_change, apr_pool_t *pool) argument
231 blame_wrapper_receiver2(void *baton, svn_revnum_t start_revnum, svn_revnum_t end_revnum, apr_int64_t line_no, svn_revnum_t revision, apr_hash_t *rev_props, svn_revnum_t merged_revision, apr_hash_t *merged_rev_props, const char *merged_path, const char *line, svn_boolean_t local_change, apr_pool_t *pool) argument
303 blame_wrapper_receiver(void *baton, apr_int64_t line_no, svn_revnum_t revision, const char *author, const char *date, svn_revnum_t merged_revision, const char *merged_author, const char *merged_date, const char *merged_path, const char *line, apr_pool_t *pool) argument
|
Completed in 180 milliseconds