merge-po; po file header isn't getting merged correctly

[prculley]

The header region of a po file contains information on authors, last edit, copyright etc. It often gets modified on one or more branches and also needs conflict resolution during a merge. However the current script seems to only keep the current branch version, not any changes being merged in.

Is it possible to correct this? Perhaps something like a normal git merge for the header region, and then the remainder of the file using the merge-po algorithm?