2 Commits (db3b93319dc806fa437215c9224d945e81083593)

Author SHA1 Message Date
Michael Niedermayer 360d3f3c18 doc&tools: Add murge script, for analyzing 3 way conflicts. 9 years ago
Clément Bœsch 2477775bf8 doc: add Libav merge document 9 years ago