Re: Merging bug (wrong conflicts)

[Jacob Burckhardt]

Tony Hoyle writes:
> 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?

The patch is in an email sent to this mailing list.  You can get that
email at:

http://www.mail-archive.com/bug-cvs@gnu.org/msg00554.html