summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2019-04-14 10:01:58 +0100
committerChristopher Baines <mail@cbaines.net>2019-04-14 10:01:58 +0100
commitb352b5040ad028a1415e738212f8b82a5312e0e9 (patch)
tree5b9eba0a56b4c512ae4fdbd16551e09b5b3c1efc
parent0aa75dca5622c0184bd5ceb6b039e16b542b6dfc (diff)
downloaddata-service-b352b5040ad028a1415e738212f8b82a5312e0e9.tar
data-service-b352b5040ad028a1415e738212f8b82a5312e0e9.tar.gz
Add a .gitattributes file
This is recommended by the Sqitch docs.
-rw-r--r--.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..407b0be
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+sqitch.plan merge=union