[Ffmpeg-devel] Re: svn 7328 : configure dies at <<<<<< .mine
Mon Dec 18 04:29:47 CET 2006
M?ns Rullg?rd wrote:
> sean <seandarcy2 at gmail.com> writes:
>> Today's svn:
>> License: GPL
>> Creating config.mak and config.h...
>> ./configure: line 2047: syntax error near unexpected token `<<<'
>> ./configure: line 2047: `<<<<<<< .mine'
> You've modified your configure locally, and there was a conflict when
> you ran svn up. Get a clean copy, e.g. using svn revert configure.
This actually happened to me before, and I forgot about it.
More information about the ffmpeg-devel