From: Michael J Gruber <drmicha@warpmail.net>
Date: Thu, 19 Mar 2015 14:31:47 GMT
Subject: Rebase pain on (the) pot
Message-ID: <550ADDD3.9070706@warpmail.net>

Do we have a merge driver or something for the l10n files?

I'm trying to rebase an older branch on top of origin/next. My topic
branch has changes to git.pot (the old glossary command idea), and
rebasing produces a lot of conflicts due to simple line number changes
in the comments. (The de.po in the next commit to be rebased won't fair
any better, probably.)

Michael