tutorial problems

Scott H. scottbruin at gmail.com
Wed Jun 25 15:15:54 CDT 2008


On Wed, Jun 25, 2008 at 12:58 PM, Giorgos Keramidas <
keramida at ceid.upatras.gr> wrote:

>
> 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
>
> Tried that, all I get is:

merging hello.c
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

Matt:
> 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).

I don't know where to find said file (contrib/mergetools.hgrc). I installed
the Leopard package and looked through everything, but no dice. Could that
package be part of the problem?
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://selenic.com/pipermail/mercurial/attachments/20080625/fe2dbb9b/attachment.htm 


More information about the Mercurial mailing list