build

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

Job	Run time
Check formatting	18s
Build jj-lib without Git support	1m 18s
cargo-deny (advisories)	4m 18s
build (ubuntu-latest)	5m 18s
Check protos	39s
cargo-deny (bans licenses sources)	24s
Clippy check	2m 31s
build (macos-13)	12m 20s
build (macos-14)	3m 51s
Check that MkDocs can build the docs	9s
Check that MkDocs can build the docs with latest Python and uv	10s
build (windows-latest)	10m 44s
build (ubuntu-latest, --all-features)	6m 23s
	48m 23s

Provide feedback