Skip to content

merge: keep conflict markers on their own lines when hunks lack a trailing newline#85

Merged
bmwill merged 1 commit into
bmwill:masterfrom
jochenhz:fix/merge-conflict-marker-newlines
Jul 19, 2026
Merged

merge: keep conflict markers on their own lines when hunks lack a trailing newline#85
bmwill merged 1 commit into
bmwill:masterfrom
jochenhz:fix/merge-conflict-marker-newlines

fix(merge): keep conflict markers on their own lines

a7a8659
Select commit
Loading
Failed to load commit list.
Sign in for the full log view
fuzz (patch_from_bytes)
succeeded Jul 19, 2026 in 1m 7s