merge-conflict-stratum.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-conflict-stratum.stderr

blob: 36781ad713cdae0e03513bdc3f6e17b115c6a694 (plain)

1	`ERROR: Merging failed in baserock:morphs: please manually merge test/stable into test/feature in this repo and try again.`