Re: Merging bug (wrong conflicts)

[Derek R. Price]

Jacob Burckhardt wrote:

> Derek R. Price writes:
> > Could you send me your 8 merge errors as sanity.sh test cases?
>
> A patch to sanity.sh is below, but first here is some description of
> what I did.

Thanks!  This looks good and seems to prove Karl Tomlinson's patch.  I've 
checked it in along with Karl's fix.  If
this does everything I think it does, it may almost be time for a new release.  
Those merging bugs have caused me,
and I gather others, a lot of headaches in the past.

Derek

--
Derek Price                      CVS Solutions Architect ( http://CVSHome.org )
mailto:dprice@collab.net         CollabNet ( http://collab.net )
--
I will return the seeing-eye dog.
I will return the seeing-eye dog.
I will return the seeing-eye dog...

          - Bart Simpson on chalkboard, _The Simpsons_