Hacker News new | ask | show | jobs
by martinvonz 497 days ago
You can try a different conflict marker style: https://jj-vcs.github.io/jj/latest/config/#conflict-marker-s...