Skip to content

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

merge_tools: allow setting conflict marker style per-tool

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

Triggered via pull request November 23, 2024 15:00
Status Success
Total duration 9m 15s
Artifacts

build.yml

on: pull_request
Build jj-lib without Git support
45s
Build jj-lib without Git support
Check protos
32s
Check protos
Check formatting
18s
Check formatting
Check that MkDocs can build the docs
13s
Check that MkDocs can build the docs
Check that MkDocs can build the docs with latest Python and uv
11s
Check that MkDocs can build the docs with latest Python and uv
Clippy check
2m 29s
Clippy check
Matrix: build
Matrix: cargo-deny
Fit to window
Zoom out
Zoom in