feat: Update diffview integration. #398
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Adjustments to accommodate changes in Diffview.nvim. This also enables diffviews created from Neogit to use the merge-tool in Diffview.nvim.
sindrets
force-pushed
the
chore/update-diffview
branch
from
3e792bf to
56f63a0
Compare
This comment was marked as outdated.
This comment was marked as outdated.
Contributor
Author
|
@gegoune It didn't slip my mind, the PR is open for review. I don't have permission to merge, if that's what you mean. I recommend that you just roll back diffview until this is merged. Sorry for the inconvenience. |
This comment was marked as outdated.
This comment was marked as outdated.
Collaborator
|
@sindrets Thank you for your work! :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hello @TimUntersberger! I hope you're doing well.
We're working on some big changes in diffview in preparation of implementing support for multiple VCS. This PR brings some small adjustments that will be necessary for the diffview integration in Neogit to work after we have merged that refactor.
This also enables diffviews created from Neogit to use the merge-tool in Diffview.nvim. (A note on that: it seems like merge conflicts in Neogit shows up in the "Untracked" section. This seems unintentional, no?)
I'll remove the draft status of this PR once we merge the changes on our end :)