doc&tools: Add murge script, for analyzing 3 way conflicts.
authorMichael Niedermayer <michael@niedermayer.cc>
Thu, 18 Aug 2016 16:45:23 +0000 (18:45 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 22 Aug 2016 16:54:03 +0000 (18:54 +0200)
commit360d3f3c187fa81ba583fd5a74704b09872937a6
treed11869e1e913ccb8ff85440d4347e66455d07241
parentebb9a320d707b4790328ce43fd0c65dc3f3f074b
doc&tools: Add murge script, for analyzing 3 way conflicts.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
doc/libav-merge.txt
tools/murge [new file with mode: 0755]