135
135
const apr_array_header_t *markers;
138
SVN_ERR(svn_wc__db_read_conflict(&conflict, db, local_abspath,
138
SVN_ERR(svn_wc__db_read_conflict(&conflict, NULL, NULL,
139
140
scratch_pool, scratch_pool));
141
142
SVN_ERR(svn_wc__conflict_read_markers(&markers, db, local_abspath,