2 Commits (ba96a2ac855fc70fa7b7e573bcb4eb2b43741b86)

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