summaryrefslogtreecommitdiff
path: root/tests/bscs-merge.fail/regular.dir.in/systems
diff options
context:
space:
mode:
Diffstat (limited to 'tests/bscs-merge.fail/regular.dir.in/systems')
l---------tests/bscs-merge.fail/regular.dir.in/systems/default1
-rw-r--r--tests/bscs-merge.fail/regular.dir.in/systems/factory/orig/etc/10
-rw-r--r--tests/bscs-merge.fail/regular.dir.in/systems/factory/run/etc/10
-rw-r--r--tests/bscs-merge.fail/regular.dir.in/systems/version2/orig/etc/1/gitdoesnotlikemptydirs0
-rw-r--r--tests/bscs-merge.fail/regular.dir.in/systems/version2/run/etc/1/gitdoesnotlikemptydirs0
5 files changed, 1 insertions, 0 deletions
diff --git a/tests/bscs-merge.fail/regular.dir.in/systems/default b/tests/bscs-merge.fail/regular.dir.in/systems/default
new file mode 120000
index 0000000..0f51808
--- /dev/null
+++ b/tests/bscs-merge.fail/regular.dir.in/systems/default
@@ -0,0 +1 @@
+factory \ No newline at end of file
diff --git a/tests/bscs-merge.fail/regular.dir.in/systems/factory/orig/etc/1 b/tests/bscs-merge.fail/regular.dir.in/systems/factory/orig/etc/1
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/bscs-merge.fail/regular.dir.in/systems/factory/orig/etc/1
diff --git a/tests/bscs-merge.fail/regular.dir.in/systems/factory/run/etc/1 b/tests/bscs-merge.fail/regular.dir.in/systems/factory/run/etc/1
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/bscs-merge.fail/regular.dir.in/systems/factory/run/etc/1
diff --git a/tests/bscs-merge.fail/regular.dir.in/systems/version2/orig/etc/1/gitdoesnotlikemptydirs b/tests/bscs-merge.fail/regular.dir.in/systems/version2/orig/etc/1/gitdoesnotlikemptydirs
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/bscs-merge.fail/regular.dir.in/systems/version2/orig/etc/1/gitdoesnotlikemptydirs
diff --git a/tests/bscs-merge.fail/regular.dir.in/systems/version2/run/etc/1/gitdoesnotlikemptydirs b/tests/bscs-merge.fail/regular.dir.in/systems/version2/run/etc/1/gitdoesnotlikemptydirs
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/bscs-merge.fail/regular.dir.in/systems/version2/run/etc/1/gitdoesnotlikemptydirs