[glom/glom-1-10] Added .gitattributes, to use git-merge-changelog

[Murray Cumming <murrayc src gnome org>]

commit 89817040bd1ac3fdc6153d65f5ab47f614fe2311
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Jun 29 14:23:44 2009 +0200

    Added .gitattributes, to use git-merge-changelog

 .gitattributes |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..147c297
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+ChangeLog    merge=merge-changelog
+