diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2012-12-15 22:01:18 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2012-12-15 22:01:18 +0200 |
| commit | 0c6eb4d4b1e1f4b6e1aee116929863f9b820fdcc (patch) | |
| tree | 8afdf9663c53c3a25442e8b0c93f5b2b15d8501a /po | |
| parent | cd14ae87e64199c0d9755a4f4a5e8e96b91fb60f (diff) | |
| download | gawk-0c6eb4d4b1e1f4b6e1aee116929863f9b820fdcc.tar.gz | |
Add a script to help with merges in po directory.
Diffstat (limited to 'po')
| -rwxr-xr-x | po/fix-merge.awk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/po/fix-merge.awk b/po/fix-merge.awk new file mode 100755 index 00000000..ec9e253b --- /dev/null +++ b/po/fix-merge.awk @@ -0,0 +1,6 @@ +#! /usr/bin/gawk -f + +/^<<<<<<< HEAD/ { next } +/^=======/, /^>>>>>>> / { next } + +{ print } |