tests.branching/merge-conflict-chunks.stderr


1
2
3
4
5
6

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, and then merge the system branch.