Skip to content

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

merge_tools: allow setting conflict marker style per-tool

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

Triggered via pull request November 23, 2024 01:32
Status Success
Total duration 10m 51s
Artifacts

build.yml

on: pull_request
Build jj-lib without Git support
47s
Build jj-lib without Git support
Check protos
36s
Check protos
Check formatting
20s
Check formatting
Check that MkDocs can build the docs
9s
Check that MkDocs can build the docs
Check that MkDocs can build the docs with latest Python and uv
10s
Check that MkDocs can build the docs with latest Python and uv
Clippy check
2m 39s
Clippy check
Matrix: build
Matrix: cargo-deny
Fit to window
Zoom out
Zoom in