abort: could not symlink

[Matt Mackall]

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?

-- 
http://selenic.com : development and support for Mercurial and Linux