Easymerge Extension
This extension is not distributed with Mercurial.
Author: Sébastien Pierre
Download site: [http://www.ivy.fr/mercurial/easy/mercurial-easy-latest.tar.gz]
Overview
Easymerge is part of the [http://www.ivy.fr/mercurial/easy Mercurial Easy] and provides you with a command-line GUI when merging from Mercurial.
Easymerge makes it easy:
* To do pick which files you'd like to merge first * To spot which changesets you are merging * To undo/redo your resolution (easymerge keeps backup)
Easymerge supports various merge utilities, including gvimdiff, filemerge, meld, kdiff3.
You can see a screenshot of the interface [http://www.ivy.fr/mercurial/easy/merge.png here].
Configuration
Configure your .hgrc to enable the extension by adding following lines:
[extensions] # JUST POINT TO WHERE YOU UNPACKED THE MERCURIAL EASY EXTENSIONS merge = ~/Local/Mercurial-Easy/Sources/easyhg/easymerge.py