summaryrefslogtreecommitdiff
path: root/tests.merging/conflict-stratum-field-ordering.stdout
Commit message (Collapse)AuthorAgeFilesLines
* Exorcise some old and unused commandsRichard Maw2014-07-071-2/+0
| | | | | | | | | | | | | `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.
* tests: Use test: URL prefix instead of baserock: throughoutSam Thursfield2012-11-071-1/+1
| | | | | | | | | | Some tests already used test: and in order to be able to share the scripts/setup-3rd-party-strata script they need to all use the same prefix. Using baserock: implies that we are using real code from Baserock, so I picked test: because the tests only ever use mock morphologies and no real code.
* Split merge tests out from the other branching testsSam Thursfield2012-10-291-0/+2
Merge is by far the most complex of the branching and merging commands.