aboutsummaryrefslogtreecommitdiff
path: root/deps/lightning/.gitattributes
diff options
context:
space:
mode:
Diffstat (limited to 'deps/lightning/.gitattributes')
-rw-r--r--deps/lightning/.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/deps/lightning/.gitattributes b/deps/lightning/.gitattributes
new file mode 100644
index 0000000..e8495d5
--- /dev/null
+++ b/deps/lightning/.gitattributes
@@ -0,0 +1 @@
+ChangeLog merge=merge-changelog