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