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

/freebsd-13-stable/contrib/subversion/subversion/libsvn_wc/
H A Dprops.c908 svn_boolean_t merged_prop = FALSE;
933 merged_prop = TRUE;
939 if (!merged_prop)
1166 svn_boolean_t merged_prop = FALSE;
1203 merged_prop = TRUE;
1207 if (!merged_prop)
906 svn_boolean_t merged_prop = FALSE; local
1164 svn_boolean_t merged_prop = FALSE; local
/freebsd-13-stable/contrib/subversion/subversion/svn/
H A Dconflict-callbacks.c347 svn_stream_t *merged_prop;
349 SVN_ERR(svn_stream_open_unique(&merged_prop, &file_path, NULL,
352 SVN_ERR(merge_prop_conflict(merged_prop, base_propval, my_propval,
357 SVN_ERR(svn_stream_close(merged_prop));
346 svn_stream_t *merged_prop; local

Completed in 120 milliseconds