Chris@531: {Sharing changes}
Chris@531: 
Chris@531: How do I use the Merge window?
Chris@531: 
Chris@531: 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.
Chris@531: 
Chris@531: 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.
Chris@531: 
Chris@531: #merge50
Chris@531: 
Chris@531: (This is actually a separate program, a merge tool called kdiff3.)
Chris@531: 
Chris@531: This looks a bit complicated, but it is there to help you pick which
Chris@531: of the changes from each of the two "rival" versions of the file you
Chris@531: want to use in your merged version.
Chris@531: 
Chris@531: