# HG changeset patch
# User Chris Cannam
# Date 1322067823 0
# Node ID f56e5c39aad1dae91e5716eab08679b59d7dc237
# Parent  2262f753b19ef6b690ba3f910be36054d91a2fc7
Start work on merge topic

diff -r 2262f753b19e -r f56e5c39aad1 easyhg.qrc
--- a/easyhg.qrc	Wed Nov 23 11:24:23 2011 +0000
+++ b/easyhg.qrc	Wed Nov 23 17:03:43 2011 +0000
@@ -42,9 +42,12 @@
 	<file>help/a-31.html</file>
 	<file>help/a-32.html</file>
 	<file>help/a-33.html</file>
+	<file>help/a-34.html</file>
+	<file>help/a-40.html</file>
 	<file>help/images/openremote50.png</file>
 	<file>help/images/openfolder50.png</file>
 	<file>help/images/openlocal50.png</file>
+	<file>help/images/merge50.png</file>
 	<file>easyhg.py</file>
 	<file>easyhg_en.qm</file>
     </qresource>
diff -r 2262f753b19e -r f56e5c39aad1 help/a-33.html
--- 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>
 
diff -r 2262f753b19e -r f56e5c39aad1 help/a-34.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/help/a-34.html	Wed Nov 23 17:03:43 2011 +0000
@@ -0,0 +1,16 @@
+<link rel="stylesheet" type="text/css" href="help.css"/>
+
+
+<h2>How do I use this Merge window?</h2>
+
+<p>If you are working with other people on a project, it is likely that
+at some point you'll find that more than one of you have edited the
+same lines in the same file, in different ways.</p>
+
+<p>When that happens and you try to merge the two versions, EasyMercurial
+will pop up a merge window that looks a bit like this.</p>
+
+<p><center><img src="images/merge50.png"></center></p>
+
+<p>(This is actually a separate program, a merge tool called kdiff3.)</p>
+
diff -r 2262f753b19e -r f56e5c39aad1 help/a-40.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/help/a-40.html	Wed Nov 23 17:03:43 2011 +0000
@@ -0,0 +1,9 @@
+<link rel="stylesheet" type="text/css" href="help.css"/>
+
+
+<h2>Video tutorials</h2>
+
+<p>There are some very simple video tutorials available on the EasyMercurial website.</p>
+
+<p>Please see <a href="http://easyhg.org/videos.html">http://easyhg.org/videos.html</a>.</p>
+
diff -r 2262f753b19e -r f56e5c39aad1 help/images/merge.png
Binary file help/images/merge.png has changed
diff -r 2262f753b19e -r f56e5c39aad1 help/images/merge50.png
Binary file help/images/merge50.png has changed
diff -r 2262f753b19e -r f56e5c39aad1 help/topics.html
--- a/help/topics.html	Wed Nov 23 11:24:23 2011 +0000
+++ b/help/topics.html	Wed Nov 23 17:03:43 2011 +0000
@@ -20,3 +20,6 @@
 <p><a href="a-31.html">I want to let my colleagues pull changes directly from my local repository</a></p>
 <p><a href="a-32.html">I want to put my changes into a master repository shared with my colleagues</a></p>
 <p><a href="a-33.html">I tried to push my changes, but it told me &ldquo;the remote repository may have been changed by someone else&rdquo; and refused</a></p>
+<p><a href="a-34.html">How do I use this Merge window?</a></p>
+<h3>See also</h3>
+<p><a href="a-40.html">Video tutorials</a></p>
diff -r 2262f753b19e -r f56e5c39aad1 help/topics/33.txt
--- a/help/topics/33.txt	Wed Nov 23 11:24:23 2011 +0000
+++ b/help/topics/33.txt	Wed Nov 23 17:03:43 2011 +0000
@@ -31,7 +31,7 @@
 
 *2. Click Merge in the toolbar on the left.*
 
- * 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.
+ * 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 [[34|How do I merge my changes...]] for more about this.
 
 *3. Review or test the resulting merged version in your local working folder.*
 
diff -r 2262f753b19e -r f56e5c39aad1 help/topics/34.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/help/topics/34.txt	Wed Nov 23 17:03:43 2011 +0000
@@ -0,0 +1,20 @@
+{Sharing changes}
+
+How do I use the Merge window?
+
+If you are working with other people on a project, it is likely that
+at some point you'll find that more than one of you have edited the
+same lines in the same file, in different ways.
+
+When that happens and you try to merge the two versions, EasyMercurial
+will pop up a merge window that looks a bit like this.
+
+#merge50
+
+(This is actually a separate program, a merge tool called kdiff3.)
+
+This looks a bit complicated, but it is there to help you pick which
+of the changes from each of the two "rival" versions of the file you
+want to use in your merged version.
+
+