mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2026-01-07 05:25:12 +00:00
6086305304
git-subtree-dir: submodules/ffmpeg git-subtree-mainline:8f5a4f7dc1git-subtree-split:53fc3dcb60
12 lines
630 B
Bash
Executable File
12 lines
630 B
Bash
Executable File
#!/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
|