From dc5d469d6574e9fb03bdd793658bb371315b306a Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Mon, 12 Oct 2015 08:54:49 +0000 Subject: Vendor import of subversion-1.9.2 --- subversion/svn/cl-conflicts.h | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'subversion/svn/cl-conflicts.h') diff --git a/subversion/svn/cl-conflicts.h b/subversion/svn/cl-conflicts.h index 07591a0ef02c..d4880748cd9c 100644 --- a/subversion/svn/cl-conflicts.h +++ b/subversion/svn/cl-conflicts.h @@ -63,6 +63,16 @@ svn_cl__get_human_readable_tree_conflict_description( const svn_wc_conflict_description2_t *conflict, apr_pool_t *pool); +/* Like svn_cl__get_human_readable_tree_conflict_description but + for other conflict types */ +svn_error_t * +svn_cl__get_human_readable_action_description( + const char **desc, + svn_wc_conflict_action_t action, + svn_wc_operation_t operation, + svn_node_kind_t kind, + apr_pool_t *pool); + /** * Append to @a str an XML representation of the conflict data * for @a conflict, in a format suitable for 'svn info --xml'. -- cgit v1.2.3