[FFmpeg-devel] Confusing git merges

David Woodhouse dwmw2 at infradead.org
Sun Mar 20 00:32:59 CET 2011

On Sat, 2011-03-19 at 22:24 +0100, Michael Niedermayer wrote:
> i have no control over the tree i pull from

Unless you say "ewww, I'm not pulling that. Please clean it up
first". :)


More information about the ffmpeg-devel mailing list