summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorPaolo Bonzini <bonzini@gnu.org>2008-04-10 11:14:38 +0200
committerPaolo Bonzini <bonzini@gnu.org>2008-04-10 11:14:38 +0200
commit6b96a347ca463bb91d7b6144edc3cba245e10891 (patch)
tree5636c8d573594068464db0d0388fed57bf4c085d /.gitattributes
parent30bdbe1e61b7c34ad1faf75e9c11b079d082b915 (diff)
downloadsed-6b96a347ca463bb91d7b6144edc3cba245e10891.tar.gz
add .gitattributes file
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 0000000..e8495d5
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+ChangeLog merge=merge-changelog