From e14d64a03c6aa3e567b57f0c0a003ca2185f4493 Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@yahoo-inc.com>
Date: Tue, 23 Apr 2013 22:53:53 -0700
Subject: Add a bunch of new merging test files + runner.

---
 tests/data/merge_sources/source2-1.yaml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 tests/data/merge_sources/source2-1.yaml

(limited to 'tests/data/merge_sources/source2-1.yaml')

diff --git a/tests/data/merge_sources/source2-1.yaml b/tests/data/merge_sources/source2-1.yaml
new file mode 100644
index 00000000..c7a33aaa
--- /dev/null
+++ b/tests/data/merge_sources/source2-1.yaml
@@ -0,0 +1,6 @@
+#cloud-config
+
+
+Blah: 1
+Blah2: 2
+Blah3: 3
-- 
cgit v1.2.3