]> git.ipfire.org Git - thirdparty/gettext.git/commitdiff
projects / thirdparty / gettext.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cce72a7)
Specify custom merge drivers.
authorBruno Haible <bruno@clisp.org>
Thu, 2 Jul 2009 08:33:57 +0000 (10:33 +0200)
committerBruno Haible <bruno@clisp.org>
Thu, 2 Jul 2009 08:33:57 +0000 (10:33 +0200)
.gitattributes [new file with mode: 0644] patch | blob

diff --git a/.gitattributes b/.gitattributes
new file mode 100644 (file)
index 0000000..ca4ea27
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+ChangeLog      merge=merge-changelog
Mirror of https://github.com/autotools-mirror/gettext.git