Author: stsp
Revision: 1765506
Modified property: svn:log

Modified: svn:log at Tue Oct 18 21:09:21 2016
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Tue Oct 18 21:09:21 2016
@@ -1,5 +1,5 @@
 * subversion/libsvn_client/conflicts.c
   (resolve_incoming_delete_accept): Lock the parent of the node we're deleting,
-   else the resolver will error out erroneously accepting an incoming deletion.
+   or the resolver will error out erroneously if accepting an incoming 
deletion.
 
 Found by: stilor

Reply via email to