2 Commits (207d78176f868555ed7b5db4eb6ec9af9d3f700d)

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