build

merge_tools: allow setting conflict marker style per-tool #16512

Job	Run time
Build jj-lib without Git support	48s
Check protos	52s
build (ubuntu-latest)	5m 12s
cargo-deny (advisories)	23s
build (macos-13)	8m 42s
Clippy check	2m 38s
cargo-deny (bans licenses sources)	23s
Check that MkDocs can build the docs	8s
build (macos-14)	4m 12s
build (windows-latest)	10m 55s
Check that MkDocs can build the docs with latest Python and uv	11s
Check formatting	19s
build (ubuntu-latest, --all-features)	5m 57s
	40m 40s

Provide feedback