git merge conflict indicator error message #12718

Job	Run time
validate	12s
lint-build	56s
test (stable, x86_64-unknown-linux-gnu)	3m 33s
rustfmt	16s
test-wasm	1m 44s
test (stable, aarch64-unknown-linux-musl)	5m 22s
test (stable, x86_64-apple-darwin)	14m 6s
test (stable, x86_64-unknown-linux-musl)	7m 33s
test (stable, x86_64-pc-windows-msvc)	4m 42s
test (stable, aarch64-apple-darwin, macos-latest, arm64, cargo, true)	6m 15s
test (stable, aarch64-unknown-linux-gnu)	4m 40s
test-projects	2m 45s
	52m 4s

Provide feedback