Author: stsp
Revision: 1618024
Modified property: svn:log
Modified: svn:log at Thu Aug 14 19:26:48 2014
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Thu Aug 14 19:26:48 2014
@@ -2,7 +2,7 @@ For tree conflicts flagged during merges
of the versions of nodes involved in the conflict (the local working
copy node kind, the merge-left node kind, and the merge-right node kind).
-Before this change misleading node kind information was recorded.,
+Before this change misleading node kind information was recorded.
For example, nodes which are deleted at the merge-right side of the incoming
change would produce the following conflict information:
@@ -10,7 +10,7 @@ Tree conflict: local file edit, incoming
Source left: (file) ^/trunk/beta@1
Source right: (file) ^/branch/beta@3
-This is misleading since ^/branche/betas does not exist in r3 since it
+This is misleading since ^/branch/beta does not exist in r3 since it
was deleted in r2. With this change, the recorded node kind is 'none':
Tree conflict: local file edit, incoming file delete or move upon merge
