Skip to content
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

Display of merge conflict output #25

Closed
dandavison opened this issue Oct 14, 2019 · 2 comments
Closed

Display of merge conflict output #25

dandavison opened this issue Oct 14, 2019 · 2 comments

Comments

@dandavison
Copy link
Owner

Investigate use of background color highlighting (and syntax highlighting) to produce a helpful and pleasing display of git merge conflict output.
@dandavison
Copy link
Owner Author

dandavison commented Apr 21, 2020 •
edited

There seems to have been a regression; current delta shows no output when there's a merge conflict. See #125.

EDIT: That regression has been fixed.

@dandavison dandavison mentioned this issue May 15, 2020
Closed
@dandavison
Copy link
Owner Author

Let's track this in #189 which has helpful detail.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@dandavison