Author: julianfoad
Date: Tue Jan 8 16:01:19 2013
New Revision: 1430346
URL: http://svn.apache.org/viewvc?rev=1430346&view=rev
Log:
* subversion/libsvn_wc/conflicts.h
(svn_wc__conflict_skel_set_op_update,
svn_wc__conflict_skel_set_op_switch): Update doc strings following r1430305.
Modified:
subversion/trunk/subversion/libsvn_wc/conflicts.h
Modified: subversion/trunk/subversion/libsvn_wc/conflicts.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.h?rev=1430346&r1=1430345&r2=1430346&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.h (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.h Tue Jan 8 16:01:19 2013
@@ -77,7 +77,7 @@ svn_wc__conflict_skel_is_complete(svn_bo
/* Set 'update' as the conflicting operation in CONFLICT_SKEL.
Allocate data stored in the skel in RESULT_POOL.
- ORIGINAL specifies the BASE node before updating.
+ ORIGINAL and TARGET specify the BASE node before and after updating.
It is an error to set another operation to a conflict skel that
already has an operation.
@@ -95,7 +95,7 @@ svn_wc__conflict_skel_set_op_update(svn_
/* Set 'switch' as the conflicting operation in CONFLICT_SKEL.
Allocate data stored in the skel in RESULT_POOL.
- ORIGINAL specifies the BASE node before switching.
+ ORIGINAL and TARGET specify the BASE node before and after switching.
It is an error to set another operation to a conflict skel that
already has an operation.
