Re: [Gnash-dev] Rubbish in cvs updates

[Patrice Dumas]

On Mon, Jan 29, 2007 at 11:31:54PM +0000, Martin Guy wrote:
> Hi
>  I keep getting RCS internal rubbish dumped in files when I cvs
> update. Latest example: gui/Makefile.am:182
> 
> AM_LDFLAGS += $(XFT_LIBS)
> =======
> AM_LDFLAGS += $(FLTK2_LIBS) $(XFT_LIBS) $(X11_LIBS)
> >>>>>>>1.59
> else
> FLTK_SRCS =
> 
> Debian etch. Has anyone else has this problem or is it just me?

This almost look like a cvs conflict. Do you mean that cvs finds
conflicts when there is none?

--
Pat