falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
100448 Commits
32 Branches
293MB
Tree: cd97e1ff4d
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from 'cd97e1ff4d'
${ noResults }
FFmpeg/tools/murge

12 lines
630B
Raw Blame History 

  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