merge-with-stratum-renamed.stderr\tests.branching - baserock/baserock/morph.git - Morph -- Baserock build tool

index : baserock/baserock/morph.git

Morph -- Baserock build tool

summary refs log tree commit diff

path: root/tests.branching/merge-with-stratum-renamed.stderr

blob: ad144f9341932528cda54d455d5838a327feb86c (plain)

1	`ERROR: stratum goodbye-stratum was added within this branch and subsequently edited. This is not yet supported: refusing to merge.`