You can try a different conflict marker style: https://jj-vcs.github.io/jj/lates...

		martinvonz 7 months ago \| parent \| context \| favorite \| on: JJ Cheat Sheet You can try a different conflict marker style: https://jj-vcs.github.io/jj/latest/config/#conflict-marker-s...