blob: f22fcfda81911ae821f6ddce8a413fc6349fefd1
| 1 | #!/bin/sh |
| 2 | |
| 3 | grep -A99999 '^<<<<<<<' | grep -B99999 '^>>>>>>>' >murge.X |
| 4 | grep -A99999 '^====' murge.X | egrep -v '^(=======|<<<<<<<|>>>>>>>|\|\|\|\|\|\|\|)' >murge.theirs |
| 5 | grep -B99999 '^||||' murge.X | egrep -v '^(=======|<<<<<<<|>>>>>>>|\|\|\|\|\|\|\|)' >murge.ours |
| 6 | grep -B99999 '^====' murge.X | grep -A99999 '^||||' | egrep -v '^(=======|<<<<<<<|>>>>>>>|\|\|\|\|\|\|\|)' >murge.common |
| 7 | |
| 8 | colordiff -du $* murge.ours murge.theirs |
| 9 | grep . murge.common > /dev/null && colordiff -du $* murge.common murge.theirs |
| 10 | grep . murge.common > /dev/null && colordiff -du $* murge.common murge.ours |
| 11 | rm murge.theirs murge.common murge.ours murge.X |
| 12 |