A Simple Overview Of Editing and Merging

hg pull http://www.bitbucket.org/BruceEckel/python-3-patterns-idioms/
hg merge This brought up kdiff3 (note: this requires a separate installation of kdiff3)on any file’s w/ conflicts, and you get to just visually look - left-to-right at A:base, B:mine, and C:yours.... the NICE thing is when you want BOTH the other and yours, you can click BOTH B & C buttons — sweeet! you can also review the “automatic” merges, choose which - conflicts only, or any merge.
... make html; make latex ...... look at outputs (simultaneously, comparatively)... make any changes.... repeat....
hg ci without a message, it brought up an editor with a list of all changed files - so you can comment individually.