jj icon indicating copy to clipboard operation
jj copied to clipboard
Published 3 weeks ago • verified publisher icon jj-vcs

conflicts: add "diff-experimental" conflict marker style

Open scott2000 opened this issue 1 month ago • 0 comments

#7917

Checklist

If applicable:

  • [X] I have updated CHANGELOG.md
  • [ ] I have updated the documentation (README.md, docs/, demos/)
  • [ ] I have updated the config schema (cli/src/config-schema.json)
  • [X] I have added/updated tests to cover my changes

scott2000 avatar Oct 31 '25 22:10 scott2000