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

better visualisation of diff for files in conflict #580

Closed
extrawurst opened this issue Mar 10, 2021 · 1 comment
Closed

better visualisation of diff for files in conflict #580

extrawurst opened this issue Mar 10, 2021 · 1 comment
Labels
wontfix This will not be worked on

Comments

@extrawurst
Copy link
Owner

based on #576:
(&related to #485)

right now if a file is in a conflicted state, the diff is empty. it would be good if we could make it a little more obvious.
maybe just showing the ours and theirs origins.
@extrawurst extrawurst mentioned this issue Mar 10, 2021
Closed
@stale
Copy link

stale bot commented Jun 8, 2021

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

@stale stale bot added the wontfix This will not be worked on label Jun 8, 2021
@stale stale bot closed this as completed Jun 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
wontfix This will not be worked on
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@extrawurst