2

magit-diff displays a buffer, which lists all files, which differ between the two revisions one is looking at. In v1.4 it was possible to type 'e' on each of these lines or inside the diff part to call magit-ediff for this file. Somehow this functionality seems to have disappeared in v2.1. Is there any way to resurrect this?

Improve this question

1 Answer 1

Reset to default
3

At the time this question was asked, dwimming did not work inside magit-diff-mode buffers. The problem wasn't in Magit's Ediff code, all the necessary bits were there, but the low-level function magit-diff-type, which is also used by a lot of other code, was a bit lazy inside magit-diff-mode buffers and just said undefined. Anyway...

You can initiate an Ediff session from within a magit-diff-mode buffer now. magit-ediff-dwim should be able to determine what Ediff variant should be used. It detects when to use a staging session and when to use a compare session. If point is on a file, then it will a create a session for that file. Otherwise it will ask for a file (unfortunately all files will be offered as completion candidates, not just those that were modified in the range).

If that doesn't match your experience, then please let me know.

Improve this answer
11
  • The key was certainly "e". And the new "e" still does three windows instead of 2 like the old one did.
    – abo-abo
    Jul 7, 2015 at 9:47
  • @abo-abo I'm positive the old one also did three windows merge. Not that I like it that way, but I think it was configurable (maybe?).
    – wvxvw
    Jul 7, 2015 at 10:04
  • The old one does a two window diff, not a merge. I know for sure, since I'm still using the old one. And there's no way to configure it: I've opened an issue a month ago, but it was closed without a solution.
    – abo-abo
    Jul 7, 2015 at 10:09
  • 1
    The feature was not really improved for that use case from magit-diff. You can choose compare then, but you have to type in the revisions and files by hand, although they could be determined from the diff. This makes it very cumbersome to use the current ediff approach from within magit-diff.
    – Martin
    Jul 7, 2015 at 10:53
  • 1
    github.com/magit/magit/issues/1743 github.com/magit/magit/issues/1883
    – tarsius
    Jul 7, 2015 at 12:34

Your Answer

By clicking “Post Your Answer”, you agree to our terms of service and acknowledge that you have read and understand our privacy policy and code of conduct.

Not the answer you're looking for? Browse other questions tagged or ask your own question.