pub const svn_wc_merge_outcome_t_svn_wc_merge_conflict: svn_wc_merge_outcome_t = 2;
Expand description
The working copy has been (or would be) changed, but there was (or would be) a conflict
pub const svn_wc_merge_outcome_t_svn_wc_merge_conflict: svn_wc_merge_outcome_t = 2;
The working copy has been (or would be) changed, but there was (or would be) a conflict