From: Philipp Stephani <p.stephani2@gmail.com>
To: Dan LaManna <me@danlamanna.com>, emacs-devel@gnu.org
Subject: Re: Performing a 4 way diff with ediff
Date: Fri, 20 Jan 2017 11:19:17 +0000 [thread overview]
Message-ID: <CAArVCkTDy64ar3mE2d2Tj+BsoW=RC4YJqZ39N8pX35xP=VsiRg@mail.gmail.com> (raw)
In-Reply-To: <m21sw64fzr.fsf@newartisans.com>
[-- Attachment #1: Type: text/plain, Size: 818 bytes --]
John Wiegley <jwiegley@gmail.com> schrieb am Sa., 14. Jan. 2017 um
01:55 Uhr:
> >>>>> "DL" == Dan LaManna <me@danlamanna.com> writes:
>
> DL> I've been using ediff to resolve merge conflicts in git and it has the
> DL> typical windows: ours, theirs, and merged results. However, I often
> want
> DL> to see a 4th window (I believe this is called a 4 way diff) which is
> the
> DL> common ancestor of ours and theirs (A and B). I believe such
> functionality
> DL> exists in vimdiff - is there an ediff (or other emacs tool) offering
> DL> similar functionality to this?
>
> Based on this stack overflow answer, maybe not yet:
>
>
> http://stackoverflow.com/questions/15587595/can-ediff-merge-simultaneously-show-the-ancestor-a-b-and-merge-buffers
>
Filed as bug: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=25493
[-- Attachment #2: Type: text/html, Size: 1707 bytes --]
prev parent reply other threads:[~2017-01-20 11:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-14 0:27 Performing a 4 way diff with ediff Dan LaManna
2017-01-14 0:55 ` John Wiegley
2017-01-20 11:19 ` Philipp Stephani [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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAArVCkTDy64ar3mE2d2Tj+BsoW=RC4YJqZ39N8pX35xP=VsiRg@mail.gmail.com' \
--to=p.stephani2@gmail.com \
--cc=emacs-devel@gnu.org \
--cc=me@danlamanna.com \
/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.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.