New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve printing of content conflicts #66

Closed

3 tasks done

slarse opened this issue Mar 15, 2020 · 0 comments

Labels

Collaborator

slarse commented Mar 15, 2020 •

edited

Loading

The conflict markers are strangely indentede, they should be written at the left margin
Conflicts in comments cause the first line to not be indented, as it isn't in the raw text gotten from Spoon
There are many unnecessary newlines being written, which causes adjacent conflicts to insert many blank lines that aren't actually there

slarse added the enhancement label

slarse changed the title ~~Print content conflicts at the left margin~~ Improve printing of content conflicts

slarse closed this as completed in

fa13683

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment