diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2014-06-18 17:12:10 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-06-19 16:12:27 +0000 |
| commit | 76194cef80e98ba602a7d3e27ca2ae351e402037 (patch) | |
| tree | e6c1cbd39bf8e65e2c56aaaddd04b5a2d2c3fbcd /tests.merging/conflict-stratum-field-ordering.stdout | |
| parent | 398576dead0946a06c2ed80867da4618516fbe12 (diff) | |
| download | morph-76194cef80e98ba602a7d3e27ca2ae351e402037.tar.gz | |
Exorcise some old and unused commands
`morph merge` only worked for a small subset of cases, and has been left
to bit-rot, since we don't use it.
`morph tag` is just a `git tag` when we have petrified definitions
repository. We don't use it, nor do we need it, so it can go away rather
than take up valuable development time fixing it when requirements
change.
`old-foo` have all been superceded by newer versions and are no-longer
used.
Diffstat (limited to 'tests.merging/conflict-stratum-field-ordering.stdout')
| -rw-r--r-- | tests.merging/conflict-stratum-field-ordering.stdout | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests.merging/conflict-stratum-field-ordering.stdout b/tests.merging/conflict-stratum-field-ordering.stdout deleted file mode 100644 index f55822a9..00000000 --- a/tests.merging/conflict-stratum-field-ordering.stdout +++ /dev/null @@ -1,2 +0,0 @@ -Merge conflicts in test:morphs: - hello-stratum.morph |