File: murge

package info (click to toggle)
ffmpeg 7%3A8.0.1-3
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 111,180 kB
  • sloc: ansic: 1,348,518; asm: 145,582; sh: 9,273; makefile: 5,323; cpp: 3,451; lisp: 1,771; perl: 1,303; objc: 1,058; python: 120; awk: 56; ruby: 51
file content (11 lines) | stat: -rwxr-xr-x 630 bytes parent folder | download | duplicates (24) 
1
2
3
4
5
6
7
8
9
10
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