[FFmpeg-devel] FFmpeg 0.5.1

[Diego Biurrun]

On Thu, May 07, 2009 at 06:28:33PM -0300, Ramiro Polla wrote:
> On Thu, May 7, 2009 at 5:38 PM, Diego Biurrun <diego at biurrun.de> wrote:
> > I'm still waiting for you to remove the mess I never approved.
> 
> Just to make sure:
> 
> svn merge -c -18760 -c -18759 configure
> svn ci -m "Revert unapproved changes."
> 
> ?

Off the top of my head I'm not sure if this will set some sort of
mergeinfo.  Apply a diff and commit.

Diego