You might like [ui] conflict-marker-style = "snapshot" It's pretty close to what's in the article (while including more real-world useful information, b

You might like [ui] conflict-marker-style = "snapshot" It's pretty close to what's in the article (while including more real-world useful information, being part of a fully-functional VCS and all). https://docs.jj-vcs.dev/latest/conflicts/#conflict-markers https://docs.jj-vcs.dev/latest/conflicts/#conflict-markers Personally, I'm a bit torn; the snapshot style doesn't draw my attention to the actually-changed lines.