[svnbook] r4303 committed - Chapter 4...

svnbook at googlecode.com svnbook at googlecode.com
Fri Sep 7 08:43:36 CDT 2012


Revision: 4303
Author:   richardcavell at mail.com
Date:     Fri Sep  7 06:43:28 2012
Log:      Chapter 4

"the merged changed" -> "the merged changes"

Fix typographical error.


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

Modified:
  /trunk/en/book/ch04-branching-and-merging.xml

=======================================
--- /trunk/en/book/ch04-branching-and-merging.xml	Tue Jan 17 20:02:28 2012
+++ /trunk/en/book/ch04-branching-and-merging.xml	Fri Sep  7 06:43:28 2012
@@ -667,7 +667,7 @@
          </informalexample>

          <para>After any conflicts have been resolved, you can commit
-          the merged changed to your branch.  Now, to avoid
+          the merged changes to your branch.  Now, to avoid
            accidentally trying to merge these same changes into your
            branch again in the future, you'll need to record the fact
            that you've already merged them.  But where should that




More information about the svnbook-dev mailing list