[FFmpeg-devel] [PATCH] doc&tools: Add murge script, for analyzing 3 way conflicts.

[Nicolas George]

Le sextidi 6 fructidor, an CCXXIV, Michael Niedermayer a écrit :
> nicolas, ok if i apply it as is ?

Just like Clément, I was only pointing possible avenues for enhancement.

Regards,

-- 
  Nicolas George
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20160822/905165b2/attachment.sig>