build

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

Job	Run time
build (ubuntu-latest)	4m 58s
Build jj-lib without Git support	45s
build (macos-13)	7m 1s
build (macos-14)	4m 29s
cargo-deny (advisories)	23s
build (windows-latest)	10m 21s
cargo-deny (bans licenses sources)	23s
build (ubuntu-latest, --all-features)	6m 4s
Check protos	25s
Clippy check	2m 41s
Check that MkDocs can build the docs	10s
Check that MkDocs can build the docs with latest Python and uv	10s
Check formatting	17s
	38m 7s

Provide feedback