🐛 Better handling of hunk header within merge conflict

Open dandavison opened this issue 4 years ago • 0 comments

It seems that a hunk header can occur within merge conflict markers:

Raw git output	Delta attempting to handle this

See etc/examples/822-hunk-header-within-merge-conflict.diff and https://github.com/dandavison/delta/blob/8c900cb4d55c6c546c9853e7cddec89ecc67fdb7/src/handlers/hunk_header.rs#L35-L40

Dec 05 '21 02:12 dandavison