Getting Started with hg

The official mercurial tutorial here is a nice introduction.

An overview of working practices can be found here

Using kdiff3 for merging

Add these lines to your $HOME/.hgrc file

[merge-tools]
# Override stock tool location
#kdiff3.executable = ~/bin/kdiff3
# Specify command line
kdiff3.args = $base $local $other -o $output
# Give higher priority
kdiff3.priority = 1

and it should just work for your next "hg merge".

Hg View

Have a look at the HgkExtension here

To use it, edit you $HOME/.hgrc file and add the following lines:

[extensions]
hgk=

If hat does not work, you might have to specify instead the full path to hgk.py, i.e.

[extensions]
hgk=/usr/local/lib/hgk.py

Then, inside an hg repository, just type:

hg view

And a Tk window should pop with an informative graphical view of the repository history.