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

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

bmwill merged 1 commit into

bmwill:masterbmwill/diffy:masterfrom

jochenhz:fix/merge-conflict-marker-newlinesjochenhz/diffy:fix/merge-conflict-marker-newlinesCopy head branch name to clipboard