From d6463e70eeb0ad3d93788a3e0f13e2007be54c50 Mon Sep 17 00:00:00 2001
From: Stef Walter <stefw@collabora.co.uk>
Date: Thu, 9 Jun 2011 10:13:45 +0200
Subject: Complete testing of global config files and directories.

---
 tests/files/test-system-merge.conf | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 tests/files/test-system-merge.conf

(limited to 'tests/files/test-system-merge.conf')

diff --git a/tests/files/test-system-merge.conf b/tests/files/test-system-merge.conf
new file mode 100644
index 0000000..978427d
--- /dev/null
+++ b/tests/files/test-system-merge.conf
@@ -0,0 +1,7 @@
+
+# Merge in user config
+user-config: merge
+
+key1: system1
+key2: system2
+key3: system3
\ No newline at end of file
-- 
cgit v1.1