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 2013/05/09 16:05:32 UTC
svn propchange: r1480642 - svn:log
Author: stsp
Revision: 1480642
Modified property: svn:log
Modified: svn:log at Thu May 9 14:05:32 2013
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Thu May 9 14:05:32 2013
@@ -1,4 +1,4 @@
-Add new commands to the interactive conflict prompt which allows users to
+Add new commands to the interactive conflict prompt which allow users to
edit conflicted properties and use the result to resolve the property conflict.
This adds new commands to the property conflict prompt: 'edit' and 'resolved'