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 2016/04/19 13:16:34 UTC

svn propchange: r1739897 - svn:log

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

Modified: svn:log at Tue Apr 19 11:16:34 2016
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Tue Apr 19 11:16:34 2016
@@ -1,6 +1,6 @@
 Add another resolution option for file/file tree conflict "incoming add vs.
 local obstruction upon merge". This new option replaces the local file
-with the incoming fileand then merges content.
+with the incoming file and then merges content.
 
 Again, the implementation is rather crude since modifications made to the
 working copy are not atomic. This will be addressed later.