Chris@531: <link rel="stylesheet" type="text/css" href="help.css"/>
Chris@531: 
Chris@531: 
Chris@531: <h2>How do I use this Merge window?</h2>
Chris@531: 
Chris@531: <p>If you are working with other people on a project, it is likely that
Chris@531: at some point you'll find that more than one of you have edited the
Chris@531: same lines in the same file, in different ways.</p>
Chris@531: 
Chris@531: <p>When that happens and you try to merge the two versions, EasyMercurial
Chris@531: will pop up a merge window that looks a bit like this.</p>
Chris@531: 
Chris@531: <p><center><img src="images/merge50.png"></center></p>
Chris@531: 
Chris@531: <p>(This is actually a separate program, a merge tool called kdiff3.)</p>
Chris@531: