View diffs in ediff #165
Merged
View diffs in ediff #165
Conversation
This file contains 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
…ctions to give it the information it needs.
…agit-interactive-resolve-item`. `magit-ediff` actually calls `magit-interactive-resolve-item` when it's appropriate, so this only adds functionality.
(I also updated the @copyright line, since Marius is definitely not the only one who's worked on this file anymore.) This documents the change that closes magit#40.
…guration. Outside forces are less likely to interfere with a variable named magit-ediff-windows than with a register named 'm'.
|
This looks great, I'm going to merge this. Perhaps we can swap out magit-get-file-from-commit if it makes sense. |
|
Enhancement request: it would be awesome if a `C-u' prefix would allow me to choose the "treeish"es participating in the diff, rather like ediff-revision does. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This adds the feature requested in issue #40. Pressing the 'e' key with the cursor on any diff will launch ediff to show the two versions of the file.
Currently 'e' launches
magit-interactive-resolvewhen the cursor is on an unmerged change in the status buffer. The newmagit-ediff``function checks for that case and callsmagit-interactive-resolve`, so this only adds functionality to the 'e' key.