On Wed, Jun 04, 2014 at 02:44:58PM -0700, r-gaia-cs wrote:
> > +$ hg merge
> 
> Could we use
> 
> ~~~
> $ hg merge --tool kdiff3
> ~~
> 
> to avoid users going to `vimdiff`?

Using an external merge tool at all may be difficult to support
cross-platform.  *I* don't want to support kdiff3 packaging across all
of our supported OSes anyway ;).  Can't we follow the
manual-conflict-resolution (<<<<<<< ======= >>>>>>>) route taken by
novice/git/03-conflict.md?  I'd be surprised if Mercurial doesn't
support something like that.