On 12 April 2011 04:44, PJ Weisberg <[email protected]> wrote:
> I just sent a pull request to add the feature requested in Issue #40.
> Pressing 'e' with the cursor on any diff will show the two versions in
> ediff (except for unmerged files in the status buffer, where it will
> continue to call magit-interactive-resolve).
>
> https://github.com/philjackson/magit/pull/165
> or pull from:
> git://github.com/pjweisberg/magit.git issue40
>
> I've only tested it in Emacs 23, so comments are welcome.  Especially
> comments on what else I could do at line 4182, besides file a bug with
> Emacs. :-/

Will check it out soon. Ouch, the magit backlog is big :/

Cheers,
Phil

Reply via email to