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

/freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/
H A Dconflicts.h43 #define SVN_WC__CONFLICT_OP_MERGE "merge" macro
H A Dconflicts.c310 svn_skel__prepend_str(SVN_WC__CONFLICT_OP_MERGE, why, result_pool);
699 { SVN_WC__CONFLICT_OP_MERGE, svn_wc_operation_merge },

Completed in 108 milliseconds