Re: Merging bug (wrong conflicts)

[Tony Hoyle]

Jacob Burckhardt wrote:
> I tested your cvs patch and it works great.  Please try to get it into
> the official cvs.  I will be glad to help with that.  For example, I
> would volunteer to help make your patch follow all of the rules in
> the cvs distribution file HACKING.

I only just caught this thread.  I'm currently seeing some really nasty
merging errors, and hope that this can go some way to fixing it.

Is there a URL do download the patch from?

Tony

-- 

The only secure computer is one that's unplugged, locked in a safe,
and buried 20 feet under the ground in a secret location... and i'm
not even too sure about that one"--Dennis Huges, FBI.

tmh@magenta-netlogic.com