subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn propchange: r1241490 - svn:log
Date Tue, 07 Feb 2012 15:46:42 GMT
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.


Mime
View raw message