Searched refs:conflict_func2 (Results 1 – 10 of 10) sorted by relevance
75 ctx->conflict_func2, in svn_client__resolve_conflicts()135 ctx->conflict_func2, in svn_client_resolve()
113 public_ctx->conflict_func2 = call_conflict_func; in svn_client_create_context2()
412 = ctx->conflict_func2 ? apr_hash_make(pool) : NULL; in svn_client__switch_internal()439 if (! err1 && ctx->conflict_func2) in svn_client__switch_internal()
620 = ctx->conflict_func2 ? apr_hash_make(pool) : NULL; in svn_client__update_internal()706 if (! err && ctx->conflict_func2 && apr_hash_count(conflicted_paths)) in svn_client__update_internal()
577 ctx->conflict_func2, in switch_file_external()
10048 if (conflicted_range_report && ctx->conflict_func2 && ! dry_run) in do_merge()
528 ctx->conflict_func2 = conflict_func_merge_cmd; in svn_cl__merge()
3235 ctx->conflict_func2 = NULL; in sub_main()
978 ctx->conflict_func2 = NULL; in sub_main()
1051 svn_wc_conflict_resolver_func2_t conflict_func2; member