tutorial problems

[Matt Mackall]

On Wed, 2008-06-25 at 11:08 -0700, scottbruin wrote:
> 
> 
> Matt Mackall wrote:
> > 
> > 
> > Try merge --debug
> > 
> > 
> 
> An update with more info:
> 
> I tried this:
> $ hg update -C 2
> (...)
> $ hg merge --debug
> resolving manifests
>  overwrite None partial False
>  ancestor 82e55d328c8c local 4db0e80ae449+ remote d338c896a6f0
>   searching for copies back to rev 2
>   unmatched files in local:
>    hello.c.orig
>  hello.c: versions differ -> m
> picked tool 'internal:merge' for hello.c (binary False symlink False)

You have no merge tool configured. The usual way to configure merge
tools is to copy the settings in contrib/mergetools.hgrc to your global
hgrc file (usually /etc/hgrc or something similar).

-- 
Mathematics is the supreme nostalgia of our time.