[svnbook] r4105 committed - * en/book/ch03-advanced-topics.xml...

[svnbook at googlecode.com]

Revision: 4105
Author:   cmpilato at gmail.com
Date:     Wed Oct  5 10:16:43 2011
Log:      * en/book/ch03-advanced-topics.xml
   Suggest 'svn resolve', not the deprecated 'svn resolved'.

Patch by: Richard Cavell <richardcavell at mail.com>

http://code.google.com/p/svnbook/source/detail?r=4105

Modified:
  /trunk/en/book/ch03-advanced-topics.xml

=======================================
--- /trunk/en/book/ch03-advanced-topics.xml	Tue Oct  4 09:57:12 2011
+++ /trunk/en/book/ch03-advanced-topics.xml	Wed Oct  5 10:16:43 2011
@@ -1252,8 +1252,8 @@

          <para>To resolve property conflicts, simply ensure that the
            conflicting properties contain the values that they should,
-          and then use the <command>svn resolved</command> command to
-          alert Subversion that you have manually resolved the
+          and then use the <command>svn resolve --accept=working</command>
+          command to alert Subversion that you have manually resolved the
            problem.</para>

        </sidebar>