From 6aed1eca976c3eec6b971f18a74943c8e5274d2e Mon Sep 17 00:00:00 2001
From: Patrick Spek
Date: Wed, 26 Apr 2017 23:16:48 +0200
Subject: Update tests
---
t/files/merge.yaml | 0
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 t/files/merge.yaml
(limited to 't/files/merge.yaml')
diff --git a/t/files/merge.yaml b/t/files/merge.yaml
new file mode 100644
index 0000000..e69de29
--
cgit v1.1
From 10a43069bef7746c3970c6a00e8ef555c53b8c5c Mon Sep 17 00:00:00 2001
From: Patrick Spek
Date: Wed, 26 Apr 2017 23:44:37 +0200
Subject: Fix up test
---
t/files/merge.yaml | 2 ++
1 file changed, 2 insertions(+)
(limited to 't/files/merge.yaml')
diff --git a/t/files/merge.yaml b/t/files/merge.yaml
index e69de29..64ce87b 100644
--- a/t/files/merge.yaml
+++ b/t/files/merge.yaml
@@ -0,0 +1,2 @@
+b:
+ d: "d"
--
cgit v1.1