summaryrefslogtreecommitdiff
path: root/tests.merging/conflict-stratum-field-ordering.stdout
Commit message (Collapse)AuthorAgeFilesLines
* 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.