From d4389f16774dc66081f772334bb9d5207de3f988 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Sun, 11 Mar 2012 15:20:55 -0500
Subject: [PATCH] request special merge driver for l10n files

---
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..93a2f6338
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+*.po merge=pofile
+*.pot merge=pofile