[Ffmpeg-devel] svn 7328 : configure dies at <<<<<< .mine

[sean]

Today's svn:
License: GPL


Creating config.mak and config.h...
./configure: line 2047: syntax error near unexpected token `<<<'
./configure: line 2047: `<<<<<<< .mine'


which is these lines in configure:


fi

<<<<<<< .mine
# build pkg-config files libav*.pc and libpostproc.pc
# libavutil.pc
cat <<EOF >libavutil.pc
prefix=$PREFIX


It also appears at lines 2106 and 2127.

configure.mine exists.


sean