From: Michael Heerdegen <michael_heerdegen@web.de>
To: help-gnu-emacs@gnu.org
Subject: Re: magit diff not showing diff
Date: Fri, 04 Jul 2014 23:49:13 +0200 [thread overview]
Message-ID: <8761jciyli.fsf@web.de> (raw)
In-Reply-To: CAOm4EMsjzVqgKY4KA8J46chi7sn0PhJ-DU63P7UA1Z+A8Y9qPw@mail.gmail.com
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.
prev parent reply other threads:[~2014-07-04 21:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-02 22:51 magit diff not showing diff Shiyuan
2014-07-04 21:49 ` Michael Heerdegen [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8761jciyli.fsf@web.de \
--to=michael_heerdegen@web.de \
--cc=help-gnu-emacs@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).