← Back to branch summary

~vcs-imports/gawk/master

« back to all changes in this revision

Viewing changes to helpers/fix-merge.awk

  • Committer: Arnold D. Robbins
  • Date: 2023-05-19 08:27:24 UTC
  • mfrom: (1814.1.159)
  • mto: This revision was merged to the branch mainline in revision 1954.
  • Revision ID: git-v1:d7b069d446d2ea2bff9804944a46ce8c2a19d9e4
Merge branch 'gawk-5.2-stable'

Show diffs side-by-side

added added

removed removed

Lines of Context:
helpers/fix-merge.awk
 
1
#! /usr/bin/gawk -f
 
2
 
 
3
/^<<<<<<< HEAD/ { next }
 
4
/^=======/, /^>>>>>>> / { next }
 
5
 
 
6
{ print }