summaryrefslogtreecommitdiff
path: root/tests/data/merge.detect
diff options
context:
space:
mode:
Diffstat (limited to 'tests/data/merge.detect')
-rw-r--r--tests/data/merge.detect1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/data/merge.detect b/tests/data/merge.detect
new file mode 100644
index 0000000..1672d0d
--- /dev/null
+++ b/tests/data/merge.detect
@@ -0,0 +1 @@
+tag:yaml.org,2002:merge