Skip to content

feat(jj): parse jj-style conflict markers in parse_conflicts - #308

Merged
dlyongemallo merged 1 commit into
mainfrom
267-jj_style_conflict_markers
Aug 19, 2026
Merged

feat(jj): parse jj-style conflict markers in parse_conflicts#308
dlyongemallo merged 1 commit into
mainfrom
267-jj_style_conflict_markers

Commits

Commits on Aug 19, 2026