summaryrefslogtreecommitdiff
path: root/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7.rej
diff options
context:
space:
mode:
Diffstat (limited to 'tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7.rej')
-rw-r--r--tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7.rej6
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7.rej b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7.rej
new file mode 100644
index 0000000..13f6156
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7.rej
@@ -0,0 +1,6 @@
+--- file7
++++ file7
+@@ -1,2 +1,2 @@
+ whereami=v1,vu,v2
+-version=v1
++version=vu