Author: julianfoad
Date: Wed Dec 12 16:12:27 2012
New Revision: 1420804
URL: http://svn.apache.org/viewvc?rev=1420804&view=rev
Log:
* subversion/libsvn_wc/props.h
svn_wc__merge_props): Fix doc string, following r1417926.
Modified:
subversion/trunk/subversion/libsvn_wc/props.h
Modified: subversion/trunk/subversion/libsvn_wc/props.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.h?rev=1420804&r1=1420803&r2=1420804&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.h (original)
+++ subversion/trunk/subversion/libsvn_wc/props.h Wed Dec 12 16:12:27 2012
@@ -87,7 +87,7 @@ svn_wc__internal_propget(const svn_strin
Append any conflicts of the actual props to *CONFLICT_SKEL. (First
allocate *CONFLICT_SKEL from RESULT_POOL if it is initially NULL.
CONFLICT_SKEL itself must not be NULL.) (Changes made to the pristine
- properties, if BASE_MERGE is TRUE, do not generate conficts.)
+ properties, if NEW_PRISTINE_PROPS is non-null, do not generate conficts.)
If STATE is non-null, set *STATE to the state of the local properties
after the merge. */
