[cvsnt] Re[2]: [cvsnt] BUG! conflicts not marked in CVS/Entries any more!

[Tony Hoyle]

On Fri, 13 Sep 2002 12:22:31 +0200, Richard Wirth
<r.wirth at wirthware.de> wrote:


>in earlier times in CVS/Entries conflicts were marked by '.../Result
>of merge+DateAndTimeStampOfConflictingVersion/...'.

ook

>I think Tag or Date are already separated at this point, but as I
>stated before: The bug is elsewhere, I only found this fast hack to
>make it work again...

I've checked in a fix that reproduces the old behaviour.  The problem
was the mergepoint code that was never completely removed from the
release build.

Tony