You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by st...@apache.org on 2012/02/07 16:46:42 UTC

svn propchange: r1241490 - svn:log

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

Modified: svn:log at Tue Feb  7 15:46:42 2012
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Tue Feb  7 15:46:42 2012
@@ -2,7 +2,7 @@ On the moves-scan-log branch:
 
 * subversion/libsvn_wc/update_editor.c
   (delete_entry): Invoke the conflict callback again after determining
-   details of an "incoming move vs. locale move/delete' conflict,
+   details of an "incoming move vs. local move/delete' conflict,
    instead of falling out of the conflict callback loop prematurely.
    While here, mark another spot where we deliberately return to the
    callback with a comment.