tutorial problems

[Giorgos Keramidas]

On Wed, 25 Jun 2008 11:08:07 -0700 (PDT), scottbruin <scottbruin+nabble at gmail.com> 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)
> merging hello.c
> my hello.c at 4db0e80ae449+ other hello.c at d338c896a6f0 ancestor
> hello.c at 0a04b987be5a
> warning: conflicts during merge.
> merging hello.c failed!
> 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
> There are unresolved merges, you can redo the full merge using:
>   hg update -C 2
>   hg merge 3

Do you have local customizations to `ui.merge'?  What do you see by
typing the following commands in a shell prompt?

    hg debugconfig ui | fgrep .merge

    env | fgrep HG