From f40357f9724abd534012e78016c539da3e915e47 Mon Sep 17 00:00:00 2001
From: Albert Santoni <albert.santoni@sourcefabric.org>
Date: Wed, 27 Aug 2014 16:51:37 -0400
Subject: [PATCH] Added missing git config stuff

---
 dev_tools/scripts/git-attributes-git-merge-po | 2 ++
 dev_tools/scripts/git-config-git-merge-po     | 5 +++++
 2 files changed, 7 insertions(+)
 create mode 100644 dev_tools/scripts/git-attributes-git-merge-po
 create mode 100644 dev_tools/scripts/git-config-git-merge-po

diff --git a/dev_tools/scripts/git-attributes-git-merge-po b/dev_tools/scripts/git-attributes-git-merge-po
new file mode 100644
index 000000000..619facfe8
--- /dev/null
+++ b/dev_tools/scripts/git-attributes-git-merge-po
@@ -0,0 +1,2 @@
+   *.po   merge=pofile
+   *.pot  merge=pofile
diff --git a/dev_tools/scripts/git-config-git-merge-po b/dev_tools/scripts/git-config-git-merge-po
new file mode 100644
index 000000000..6fe011f1b
--- /dev/null
+++ b/dev_tools/scripts/git-config-git-merge-po
@@ -0,0 +1,5 @@
+[merge "pofile"]
+        name = Gettext merge driver
+        driver = git merge-po %O %A %B
+    
+