diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2012-12-15 22:04:32 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2012-12-15 22:04:32 +0200 |
| commit | 287b218ce09459ba4d66dd0c4ad6f1c48f525c82 (patch) | |
| tree | 24f838e44be4a35bfab21adab63d0127ce0b0017 /po/fix-merge.awk | |
| parent | ae9e583a257264f4580d07354e79aac63db72695 (diff) | |
| parent | 0c6eb4d4b1e1f4b6e1aee116929863f9b820fdcc (diff) | |
| download | egawk-287b218ce09459ba4d66dd0c4ad6f1c48f525c82.tar.gz egawk-287b218ce09459ba4d66dd0c4ad6f1c48f525c82.tar.bz2 egawk-287b218ce09459ba4d66dd0c4ad6f1c48f525c82.zip | |
Merge branch 'master' into array-iface
Diffstat (limited to 'po/fix-merge.awk')
| -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 } |