summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorPaolo Bonzini <bonzini@gnu.org>2009-11-20 16:48:07 +0100
committerPaolo Bonzini <bonzini@gnu.org>2009-11-20 17:15:22 +0100
commit055255944cb9e090f768c26f31da4ba90e9fdb15 (patch)
treedb3ba0b3793a5ea4298ed475ba1382bbd76c91ee /.gitattributes
parent7730872b87fd9730ac84f0675de2fedf326dfdba (diff)
downloadgrep-055255944cb9e090f768c26f31da4ba90e9fdb15.tar.gz
add .gitattributes
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..e8495d51
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+ChangeLog merge=merge-changelog