svn propchange: r1438879 - svn:log

[st...@apache.org]

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

Modified: svn:log at Sat Jan 26 12:00:42 2013
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Sat Jan 26 12:00:42 2013
@@ -10,15 +10,15 @@ branch. Thus the diff would be unnecessa
 don't actually appear when the user runs 'svn diff' in the working copy.
 
 In some cases the 'show-diff' option was entirely useless to help identify
-the incoming changes (e.g. try a merge of r1438602 into a 1.7.x@1438875
-and select the 'show-diff' option during the conflict prompt).
+the incoming changes (e.g. try a merge of r1438602 into a working copy of
+1.7.x@1438875 and select the 'show-diff' option during the conflict prompt).
 
 To fix this, show the diff between 'mine' and 'merged' during merges,
 and show the diff between 'theirs' and 'merged' during updates (this
 doesn't actually change behaviour, since 'base' matches 'theirs' during
 updates, but eliminates an unnecessary non-NULL check for the 'base' abspath).
 
-A simple example of the resuling visible change in behaviour:
+A simple example of the resulting visible change in behaviour:
 
 Consider the file ^/trunk/alpha which changed its content from 'alpha'
 to 'foo' in r3, and a ^/branch off trunk@2, where 'alpha' was changed from