diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-02-20 15:48:01 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-02-20 15:48:01 +0000 |
| commit | bcfb17b890e74538655695c4f76962b16565f664 (patch) | |
| tree | 0d89f7495dd2704d28d9d090f261c352a2675e02 /tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7.orig | |
| parent | 20e5304f40148d43c6ab57dea0abe400475e7e9f (diff) | |
| parent | d71ff3eaa4a55b32659e165efe4b78149ef240cb (diff) | |
| download | tbdiff-bcfb17b890e74538655695c4f76962b16565f664.tar.gz | |
Merge branch 'baserock/pedroalvarez/bscs-upgrade-tests3'
Reviewed-by: Richard Maw
Reviewed-by: Sam Thursfield
Diffstat (limited to 'tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7.orig')
| -rw-r--r-- | tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7.orig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7.orig b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7.orig new file mode 100644 index 0000000..93c46eb --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7.orig @@ -0,0 +1,2 @@ +whereami=v1,vu,v2 +version=v2 |