Searched refs:conflict_func2 (Results 1 - 8 of 8) sorted by relevance

/freebsd-10.0-release/contrib/subversion/subversion/libsvn_client/
H A Dresolved.c78 ctx->conflict_func2,
138 ctx->conflict_func2,
H A Dctx.c93 (*ctx)->conflict_func2 = call_conflict_func;
H A Dswitch.c416 = ctx->conflict_func2 ? apr_hash_make(pool) : NULL;
443 if (! err1 && ctx->conflict_func2)
H A Dupdate.c530 = ctx->conflict_func2 ? apr_hash_make(pool) : NULL;
606 if (! err && ctx->conflict_func2)
H A Dexternals.c488 ctx->conflict_func2,
H A Dmerge.c9873 if (conflicted_range_report && ctx->conflict_func2 && ! dry_run)
/freebsd-10.0-release/contrib/subversion/subversion/svn/
H A Dsvn.c2871 ctx->conflict_func2 = svn_cl__conflict_func_interactive;
/freebsd-10.0-release/contrib/subversion/subversion/include/
H A Dsvn_client.h1000 svn_wc_conflict_resolver_func2_t conflict_func2;
4214 * invoke @a ctx->conflict_func2 with @a ctx->conflict_baton2 to obtain
999 svn_wc_conflict_resolver_func2_t conflict_func2; member in struct:svn_client_ctx_t

Completed in 289 milliseconds