[svnbook] r4106 committed - Merge from trunk r4105.

svnbook at googlecode.com svnbook at googlecode.com
Wed Oct 5 12:21:19 CDT 2011


Revision: 4106
Author:   cmpilato at gmail.com
Date:     Wed Oct  5 10:17:15 2011
Log:      Merge from trunk r4105.
http://code.google.com/p/svnbook/source/detail?r=4106

Modified:
  /branches/1.6/en
  /branches/1.6/en/book/ch03-advanced-topics.xml

=======================================
--- /branches/1.6/en/book/ch03-advanced-topics.xml	Tue Oct  4 09:58:39 2011
+++ /branches/1.6/en/book/ch03-advanced-topics.xml	Wed Oct  5 10:17:15 2011
@@ -1251,8 +1251,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>




More information about the svnbook-dev mailing list