0011852: add git merge driver for po/pot files