help-gnu-emacs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: magit diff not showing diff


From: Michael Heerdegen
Subject: Re: magit diff not showing diff
Date: Fri, 04 Jul 2014 23:49:13 +0200
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.92 (gnu/linux)

Shiyuan <gshy2014@gmail.com> writes:

> In the *magit-log* buffer,  select two commits and diff them(by first going
> to one commit, press the key `.` and then move the cursor to another
> commit, then press the key `=`), then magit opens a `magit-diff` buffer
> where a summary of difference is shown and each difference is shown hunk by
> hunk. If I go to a hunk, and press `e`, Magit opens Ediff, but in  the
> Ediff, the difference is not shown correctly. The Ediff Control panel shows
> zero difference and the mode lines are "fileA.{nil}" and "fileB.{nil}".
> Ediff doesn't pick up the diff correctly.  Is Magit supposed to work that
> way? Do I need any extra setup?

Looks like a bug to me.  AFAIK, the Magit maintainer wants to rewrite
ediff integration:

  https://github.com/magit/magit/issues/1261

so I don't know if its worth reporting.  Using D instead of = works for
me; you can use commit hashs as input.

Michael. 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]