diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-18 18:45:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-22 18:54:03 +0200 |
| commit | 360d3f3c187fa81ba583fd5a74704b09872937a6 (patch) | |
| tree | d11869e1e913ccb8ff85440d4347e66455d07241 /tools/murge | |
| parent | ebb9a320d707b4790328ce43fd0c65dc3f3f074b (diff) | |
| download | ffmpeg-360d3f3c187fa81ba583fd5a74704b09872937a6.tar.gz | |
doc&tools: Add murge script, for analyzing 3 way conflicts.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'tools/murge')
| -rwxr-xr-x | tools/murge | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tools/murge b/tools/murge new file mode 100755 index 0000000000..f22fcfda81 --- /dev/null +++ b/tools/murge @@ -0,0 +1,11 @@ +#!/bin/sh + +grep -A99999 '^<<<<<<<' | grep -B99999 '^>>>>>>>' >murge.X +grep -A99999 '^====' murge.X | egrep -v '^(=======|<<<<<<<|>>>>>>>|\|\|\|\|\|\|\|)' >murge.theirs +grep -B99999 '^||||' murge.X | egrep -v '^(=======|<<<<<<<|>>>>>>>|\|\|\|\|\|\|\|)' >murge.ours +grep -B99999 '^====' murge.X | grep -A99999 '^||||' | egrep -v '^(=======|<<<<<<<|>>>>>>>|\|\|\|\|\|\|\|)' >murge.common + +colordiff -du $* murge.ours murge.theirs +grep . murge.common > /dev/null && colordiff -du $* murge.common murge.theirs +grep . murge.common > /dev/null && colordiff -du $* murge.common murge.ours +rm murge.theirs murge.common murge.ours murge.X |