Skip to content

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

Open
jochenhz wants to merge 1 commit into
bmwill:masterfrom
jochenhz:fix/merge-conflict-marker-newlines
Open

merge: keep conflict markers on their own lines when hunks lack a trailing newline#85
jochenhz wants to merge 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.

Workflow runs completed with no jobs