[cvsnt] Re: minor Bug in update in Build 1927

[Bo Berglund]

On Tue, 5 Apr 2005 18:42:09 +0200, Richard Wirth
<r.wirth at wirthware.de> wrote:

>File contents:
>
><<<<<<< Dmakefile
>;;; $Header: /home/cvs/repo1/Dmakefile,v 1.11 2003/10/16 14:28:07 me Exp $
>=======
>;;; $Header: /home/cvs/repo1/Dmakefile,v 1.14 2005/04/05 13:01:57 other Exp $
>>>>>>>> 1.14
>
>
>This is the only conflict! So why is this a conflict at all??

Hmm, if there *is* a modification in the same line on the two
revisions then this is per definition a conflict. CVS can hardly
decide that the conflict is too small to bother with, can it?


/Bo
(Bo Berglund, developer in Sweden)