diff help/a-33.html @ 531:f56e5c39aad1

Start work on merge topic

--- a/help/a-33.html	Wed Nov 23 11:24:23 2011 +0000
+++ b/help/a-33.html	Wed Nov 23 17:03:43 2011 +0000
@@ -30,7 +30,7 @@
 <ul><li>You should see that some changes are pulled and added to your local repository.  This will usually lead to a forked graph in the History pane, as your changes and the other user's were both started from the same parent at the same time.</li></ul></p>
 
 <p><b>2. Click Merge in the toolbar on the left.</b>
-<ul><li>Any changes that affect different files, or that affect different parts of the same file, will be merged automatically.  For changes that affect the same parts of the same file, you will be asked to choose which change to include in the merged copy.</li></ul></p>
+<ul><li>Any changes that affect different files, or that affect different parts of the same file, will be merged automatically.  For changes that affect the same parts of the same file, you will be asked to choose which change to include in the merged copy.  See <a href="a-34.html">How do I merge my changes...</a> for more about this.</li></ul></p>
 
 <p><b>3. Review or test the resulting merged version in your local working folder.</b></p>