]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
projects / thirdparty / kea.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d10325e)
[#1656] 1.9.4 release: regenerate .gitattributes
authorAndrei Pavel <andrei@isc.org>
Fri, 22 Jan 2021 10:53:50 +0000 (12:53 +0200)
committerAndrei Pavel <andrei@isc.org>
Mon, 25 Jan 2021 11:52:10 +0000 (13:52 +0200)
src/lib/log/.gitattributes [new file with mode: 0644] patch | blob

diff --git a/src/lib/log/.gitattributes b/src/lib/log/.gitattributes
new file mode 100644 (file)
index 0000000..66e94de
--- /dev/null
+++ b/src/lib/log/.gitattributes
@@ -0,0 +1,4 @@
+/logimpl_messages.cc             -diff merge=ours
+/logimpl_messages.h              -diff merge=ours
+/log_messages.cc                 -diff merge=ours
+/log_messages.h                  -diff merge=ours
Mirror of https://github.com/isc-projects/kea.git