summaryrefslogtreecommitdiffstats
path: root/src/hooks/dhcp/stat_cmds/.gitattributes
diff options
context:
space:
mode:
Diffstat (limited to 'src/hooks/dhcp/stat_cmds/.gitattributes')
-rw-r--r--src/hooks/dhcp/stat_cmds/.gitattributes2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/hooks/dhcp/stat_cmds/.gitattributes b/src/hooks/dhcp/stat_cmds/.gitattributes
new file mode 100644
index 0000000000..4c71f4d0a8
--- /dev/null
+++ b/src/hooks/dhcp/stat_cmds/.gitattributes
@@ -0,0 +1,2 @@
+/stat_cmds_messages.cc -diff merge=ours
+/stat_cmds_messages.h -diff merge=ours