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.

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

fix: correctly open conflicted files, diff view on click #74

Open
wants to merge 32 commits into
base: master
Choose a base branch
from

Conversation

vivekvjn
Copy link

@vivekvjn vivekvjn commented Nov 17, 2019

fixes #35 - error when clicking on the conflicted file which fails to open diff view. Further improvements to diff view needed, but this fixes the main issue.

@mrcrowl
Copy link
Owner

mrcrowl commented Mar 11, 2022

@hdpoliveira / @incidentist this PR is out of date now, but there might be something to keep around opening the right diff view in this commit (f7b9836).

Can you please decide if you'd like to incorporate it or discard? Thanks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unable to diff files in latest VS Code.
2 participants