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

Start work on merge topic

--- /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>
+