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: 3a7c15222a68cd87c581dfd3f0b33a38e4449c54 (plain)

1	`ERROR: Merging failed in baserock:morphs: please 'git merge' the latest test/stable into test/feature in the 'test/feature' system branch.`