[Zope-Coders] cvs keyword expansion

[Magnus Heino]

> =======
> __version__='$Revision: 1.146 $'[11:-2]
>
>  >>>>>>> 1.146
>
> As I do not have the problem with every files, I assume this is not due
> to a misuse on my side. Anyway, I do not understand what causes those
> problems.

That line has changed both in your banch, and in HEAD.

Merge with -kk

http://www.cvshome.org/docs/manual/cvs-1.12.1/cvs_12.html#SEC102

-- 

  /Magnus