[svnbook] r4147 committed - * en/book/ch04-branching-and-merging.xml...

[svnbook at googlecode.com]

Revision: 4147
Author:   ptburba at gmail.com
Date:     Thu Nov  3 13:17:34 2011
Log:      * en/book/ch04-branching-and-merging.xml
   Remove two FIXMEs that were fixed in r4126.


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

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

=======================================
--- /trunk/en/book/ch04-branching-and-merging.xml	Thu Nov  3 13:09:01 2011
+++ /trunk/en/book/ch04-branching-and-merging.xml	Thu Nov  3 13:17:34 2011
@@ -2100,8 +2100,6 @@
  </screen>
        </informalexample>

-      <!-- ### FIXME: In 1.7, record-only merges produce some output -->
-
        <para>This technique works, but it's also a little bit
          dangerous.  The main problem is that we're not clearly
          differentiating between the ideas of <quote>I already have
@@ -2183,8 +2181,6 @@
  </screen>
        </informalexample>

-      <!-- ### FIXME: In 1.7, record-only merges produce some output -->
-
        <para>Now your branch is ready to soak up changes from the trunk
          again. After another sync of your branch to the trunk, you can
          even reintegrate the branch a second time.