abort: could not symlink

[Joseph Turian]

On Sat, Aug 1, 2009 at 6:11 PM, Matt Mackall <mpm at selenic.com> wrote:

> On Sat, 2009-08-01 at 17:42 -0400, Joseph Turian wrote:
> > I tried to pull, but I had new heads.
> > When I did an hg merge, I got a wacky error, because I had moved a
> > file and changed its original path to a symlink in the head.
> > I got the following error
>
> What version are you using? What are you using as your merge tool?
>

Version = 1.1.2

I don't know what I'm using as my merge tool. What is the default? How do I
figure it out?

  Best,
  Joseph
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://selenic.com/pipermail/mercurial/attachments/20090802/fdf0cd66/attachment.htm