[Pkg-ocaml-maint-commits] [ocaml] 01/03: Add .gitattributes for easy changelog merging

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch debian/experimental
in repository ocaml.

commit c2f2fe1e61f97458dc1da81aaebc26cbfbdd9ef8
Author: Ximin Luo <infinity0 at debian.org>
Date:   Wed Aug 9 14:53:09 2017 +0200

    Add .gitattributes for easy changelog merging
---
 debian/.gitattributes | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/.gitattributes b/debian/.gitattributes
new file mode 100644
index 0000000..6a03163
--- /dev/null
+++ b/debian/.gitattributes
@@ -0,0 +1 @@
+changelog merge=dpkg-mergechangelogs

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml.git