Searched refs:SVN_WC__CONFLICT_OP_MERGE (Results 1 – 2 of 2) sorted by relevance
43 #define SVN_WC__CONFLICT_OP_MERGE "merge" macro
308 svn_skel__prepend_str(SVN_WC__CONFLICT_OP_MERGE, why, result_pool); in svn_wc__conflict_skel_set_op_merge()681 { SVN_WC__CONFLICT_OP_MERGE, svn_wc_operation_merge },