Home
last modified time | relevance | path

Searched refs:CONFLICT_REASON_SKIP_WC (Results 1 – 1 of 1) sorted by relevance

/freebsd-12-stable/contrib/subversion/subversion/libsvn_client/
Dmerge.c1130 #define CONFLICT_REASON_SKIP_WC ((svn_wc_conflict_reason_t)-3) macro
1639 || db->tree_conflict_reason == CONFLICT_REASON_SKIP_WC) in mark_dir_edited()
1722 || fb->tree_conflict_reason == CONFLICT_REASON_SKIP_WC) in mark_file_edited()
2638 db->tree_conflict_reason = CONFLICT_REASON_SKIP_WC; in merge_dir_opened()