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