Searched refs:merge_cmd (Results 1 - 2 of 2) sorted by relevance

/freebsd-10-stable/contrib/subversion/subversion/svn/
H A Dcl.h206 const char *merge_cmd; /* the external merge command to use
202 const char *merge_cmd; /* the external merge command to use member in struct:svn_cl__opt_state_t
H A Dsvn.c2239 opt_state.merge_cmd = apr_pstrdup(pool, opt_arg);
2871 if (opt_state.merge_cmd)
2873 SVN_CONFIG_OPTION_DIFF3_CMD, opt_state.merge_cmd);

Completed in 148 milliseconds