path: root/tests.branching/merge-conflict-chunks.stderr

ERROR: merge errors were encountered in the following repositories:

	baserock:stratum2-hello
	baserock:stratum3-hello

Please manually merge the target ref into test/feature in each case in the test/feature system branch, and then repeat the system branch merge.