summaryrefslogtreecommitdiff
path: root/tests/bscs-merge.pass/regular.symb.out/systems/version2/run/etc/afile
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-10-02 18:40:41 +0100
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-10-02 18:46:22 +0100
commit3190be6906eb21a1ba6878d3c8edb4bd16f925d7 (patch)
tree0ab542a7485178546d54e777d9432619c1c8020e /tests/bscs-merge.pass/regular.symb.out/systems/version2/run/etc/afile
parentfb9bdefbbbdbd8fef01278b7c3d9c1592998f6d1 (diff)
parentfef35900a703ac8401e60a2fb89166b3a7e7a27b (diff)
downloadtbdiff-3190be6906eb21a1ba6878d3c8edb4bd16f925d7.tar.gz
Merge branch 'sam/allow-file-migrations'
Reviewed-By: Richard Ipsum <richard.ipsum@codethink.co.uk> Reviewed-By: Richard Maw <richard.maw@codethink.co.uk> Reviewed-By: Paul Sherwood <paul.sherwood@codethink.co.uk>
Diffstat (limited to 'tests/bscs-merge.pass/regular.symb.out/systems/version2/run/etc/afile')
-rw-r--r--tests/bscs-merge.pass/regular.symb.out/systems/version2/run/etc/afile0
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/bscs-merge.pass/regular.symb.out/systems/version2/run/etc/afile b/tests/bscs-merge.pass/regular.symb.out/systems/version2/run/etc/afile
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/bscs-merge.pass/regular.symb.out/systems/version2/run/etc/afile