tutorial problems

[Giorgos Keramidas]

On Wed, 25 Jun 2008 11:56:28 -0700, "Scott Hulbert" <shulbert at ucla.edu> wrote:
> On Wed, Jun 25, 2008 at 11:41 AM, Giorgos Keramidas <
> keramida at ceid.upatras.gr> wrote:
>
>> 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
>
> Both commands return blank. All that's in my ~/.hgrc file is:
>
> [ui]
> username = Scott Hulbert <scottbruin at gmail.com>
>
> [extensions]
> hgext.graphlog =

That's odd.  Do you have either HGEDITOR or EDITOR set in your shell
environment?  If not, can you try repeating the merge after setting
EDITOR to an existing editor program?

    $ EDITOR=vi ; export EDITOR

    $ hg update --clean CHANGE
    $ hg merge