merge error

[Matt Mackall]

On Fri, May 13, 2005 at 05:34:24PM -0600, Jake Edge wrote:
> Matt Mackall wrote:
> >On Fri, May 13, 2005 at 05:23:52PM -0600, Jake Edge wrote:
> >
> >>Hi Matt,
> >>
> >>I just tried to do a merge from hg://selenic.com/hg into a repo that was 
> >>just a pull from your tree yesterday (or this morning) up through 
> >>64:b3e2ddff0159d52f30304cd4f80f87170e80e11d and I got the following error:
> >
> >
> >Are you using the tip?
> 
> no, i was using that version i specified ... i have since grabbed the 
> latest (merging into an empty repo worked fine) ... i presume this is 
> fixed there ...

Should be. Try using it to pull into the repo that was having a
problem.

-- 
Mathematics is the supreme nostalgia of our time.