Home
last modified time | relevance | path

Searched defs:new_conflict (Results 1 – 4 of 4) sorted by relevance

/freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/
HDutil.c281 svn_wc_conflict_description2_t *new_conflict; in svn_wc_conflict_description2_dup() local
362 svn_wc_conflict_description_t *new_conflict; in svn_wc__cd2_to_cd() local
HDtree_conflicts.c215 svn_wc_conflict_description2_t *new_conflict; in svn_wc__deserialize_conflict() local
HDdeprecated.c3228 svn_wc_conflict_description_t *new_conflict; in conflict_description_dup() local
/freebsd-11-stable/usr.sbin/etcupdate/
HDetcupdate.sh681 new_conflict() function