conflict-morphology-kind.stderr\tests.merging - 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.merging/conflict-morphology-kind.stderr

blob: ff6539a76acd04c5b8b047930bd23def61e665d1 (plain)

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