summaryrefslogtreecommitdiff
path: root/tests/bscs-merge.pass/empty.out/systems/version2
diff options
context:
space:
mode:
Diffstat (limited to 'tests/bscs-merge.pass/empty.out/systems/version2')
-rw-r--r--tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1v2-11
-rw-r--r--tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1v2-20
-rw-r--r--tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1vuv2-11
-rw-r--r--tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/vuv2-11
-rw-r--r--tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/vuv2-20
-rw-r--r--tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1v2-11
-rw-r--r--tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1v2-20
-rw-r--r--tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vu-10
-rw-r--r--tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vu-21
-rw-r--r--tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vuv2-11
-rw-r--r--tests/bscs-merge.pass/empty.out/systems/version2/run/etc/vuv2-10
-rw-r--r--tests/bscs-merge.pass/empty.out/systems/version2/run/etc/vuv2-21
12 files changed, 7 insertions, 0 deletions
diff --git a/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1v2-1 b/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1v2-1
new file mode 100644
index 0000000..a7f8d9e
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1v2-1
@@ -0,0 +1 @@
+bla
diff --git a/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1v2-2 b/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1v2-2
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1v2-2
diff --git a/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1vuv2-1 b/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1vuv2-1
new file mode 100644
index 0000000..a7f8d9e
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1vuv2-1
@@ -0,0 +1 @@
+bla
diff --git a/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/vuv2-1 b/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/vuv2-1
new file mode 100644
index 0000000..a7f8d9e
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/vuv2-1
@@ -0,0 +1 @@
+bla
diff --git a/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/vuv2-2 b/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/vuv2-2
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/vuv2-2
diff --git a/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1v2-1 b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1v2-1
new file mode 100644
index 0000000..a7f8d9e
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1v2-1
@@ -0,0 +1 @@
+bla
diff --git a/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1v2-2 b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1v2-2
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1v2-2
diff --git a/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vu-1 b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vu-1
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vu-1
diff --git a/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vu-2 b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vu-2
new file mode 100644
index 0000000..a7f8d9e
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vu-2
@@ -0,0 +1 @@
+bla
diff --git a/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vuv2-1 b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vuv2-1
new file mode 100644
index 0000000..a7f8d9e
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vuv2-1
@@ -0,0 +1 @@
+bla
diff --git a/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/vuv2-1 b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/vuv2-1
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/vuv2-1
diff --git a/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/vuv2-2 b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/vuv2-2
new file mode 100644
index 0000000..a7f8d9e
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/vuv2-2
@@ -0,0 +1 @@
+bla