build

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

Job	Run time
Build jj-lib without Git support	45s
build (ubuntu-latest)	5m 7s
build (macos-13)	6m 35s
Check protos	23s
build (macos-14)	3m 46s
build (windows-latest)	10m 55s
build (ubuntu-latest, --all-features)	5m 59s
Check that MkDocs can build the docs	9s
Check that MkDocs can build the docs with latest Python and uv	18s
Check formatting	15s
cargo-deny (advisories)	25s
cargo-deny (bans licenses sources)	23s
Clippy check	2m 31s
	37m 31s

Provide feedback