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

Sign in to view logs

Triggered via pull request November 26, 2024 14:38

scott2000

synchronize #4951

scott2000:merge-tool-conflict-marker-style

Status Success

Total duration 10m 52s

Artifacts –

build.yml

on: pull_request

Build jj-lib without Git support

Check formatting

Check that MkDocs can build the docs

Check that MkDocs can build the docs with latest Python and uv

Matrix: build

Matrix: cargo-deny