[svnbook commit] r1295 - trunk/src/en/book

[maxb]

Author: maxb
Date: Tue May 17 07:46:07 2005
New Revision: 1295

Modified:
   trunk/src/en/book/ch03.xml
Log:
Merging others' changes into your working copy is done with "svn update", not
"svn merge". Reported by Luke Worth <luke at worth.id.au>.
Also clarify exactly what is being merged.

* en/book/ch03.xml (svn-ch-3-sect-5): Fix.


Modified: trunk/src/en/book/ch03.xml
==============================================================================
--- trunk/src/en/book/ch03.xml	(original)
+++ trunk/src/en/book/ch03.xml	Tue May 17 07:46:07 2005
@@ -455,10 +455,10 @@
       </listitem>
 
       <listitem>
-        <para>Merge others' changes</para>
+        <para>Merge others' changes into your working copy</para>
         <itemizedlist>
           <listitem>
-            <para><command>svn merge</command></para>
+            <para><command>svn update</command></para>
           </listitem>
           <listitem>
             <para><command>svn resolved</command></para>