summaryrefslogtreecommitdiffstats
path: root/_test/data/merge.data
diff options
context:
space:
mode:
Diffstat (limited to '_test/data/merge.data')
-rw-r--r--_test/data/merge.data1
1 files changed, 1 insertions, 0 deletions
diff --git a/_test/data/merge.data b/_test/data/merge.data
new file mode 100644
index 0000000..e455bbc
--- /dev/null
+++ b/_test/data/merge.data
@@ -0,0 +1 @@
+- <<