summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-02-12 20:34:34 +0100
committerDouwe Maan <douwe@gitlab.com>2015-02-12 20:50:09 +0100
commit4377ba1c360cf6f4d15e3b5ad2a7ed7bc41f795e (patch)
tree6ef31ceb6f50d1796cac2c790c0eedd7e8c4a000 /.gitattributes
parent30cf916b263c187fe231acb6e622d21297092add (diff)
downloadgitlab-ce-4377ba1c360cf6f4d15e3b5ad2a7ed7bc41f795e.tar.gz
Use gitattribute merge=union to reduce CHANGELOG merge conflicts.
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 00000000000..7e800609e6c
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+CHANGELOG merge=union \ No newline at end of file