Lines Matching refs:conflict
47 * description of a property conflict described by @a conflict.
54 svn_client_conflict_t *conflict,
59 * description of a tree conflict described by @a conflict.
66 svn_client_conflict_t *conflict,
70 for other conflict types */
80 * Append to @a str an XML representation of the conflict data
81 * for @a conflict, in a format suitable for 'svn info --xml'.
86 svn_client_conflict_t *conflict,