← Back to branch summary

~vcs-imports/gawk/master 

1
2
3
4
5
6

#! /usr/bin/gawk -f

/^<<<<<<< HEAD/	{ next }
/^=======/, /^>>>>>>> / { next }

{ print }