build

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

Job	Run time
build (ubuntu-latest)	5m 7s
Build jj-lib without Git support	47s
Check protos	36s
build (macos-13)	6m 10s
build (macos-14)	4m 40s
Check formatting	20s
build (windows-latest)	10m 21s
build (ubuntu-latest, --all-features)	6m 3s
cargo-deny (advisories)	24s
Clippy check	2m 39s
cargo-deny (bans licenses sources)	22s
Check that MkDocs can build the docs	9s
Check that MkDocs can build the docs with latest Python and uv	10s
	37m 48s

Provide feedback