merge-handles-unmergable-cases.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-handles-unmergable-cases.stderr

blob: 64c9c34bcce38834272bc36ac1d21682bb7e6ccd (plain)

1	`ERROR: merge conflict: "kind" of morphology hello-stratum changed from chunk to stratum`