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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
