build

tutorial: fix conflict formatting issue #16639

Job	Run time
Check protos	28s
Build jj-lib without Git support	49s
build (ubuntu-latest)	5m 1s
cargo-deny (advisories)	24s
build (macos-13)	13m 34s
cargo-deny (bans licenses sources)	24s
Clippy check	2m 35s
Check that MkDocs can build the docs	11s
build (macos-14)	4m 19s
build (windows-latest)	10m 58s
Check that MkDocs can build the docs with latest Python and uv	11s
Check formatting	19s
build (ubuntu-latest, --all-features)	6m 19s
	45m 32s

Provide feedback