* Performing a 4 way diff with ediff
@ 2017-01-14 0:27 Dan LaManna
2017-01-14 0:55 ` John Wiegley
0 siblings, 1 reply; 3+ messages in thread
From: Dan LaManna @ 2017-01-14 0:27 UTC (permalink / raw)
To: emacs-devel
Hi all,
I've been using ediff to resolve merge conflicts in git and it has the
typical windows: ours, theirs, and merged results. However, I often want
to see a 4th window (I believe this is called a 4 way diff) which is the
common ancestor of ours and theirs (A and B). I believe such
functionality exists in vimdiff - is there an ediff (or other emacs
tool) offering similar functionality to this?
Thanks,
Dan
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Performing a 4 way diff with ediff
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
0 siblings, 1 reply; 3+ messages in thread
From: John Wiegley @ 2017-01-14 0:55 UTC (permalink / raw)
To: Dan LaManna; +Cc: emacs-devel
>>>>> "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
--
John Wiegley GPG fingerprint = 4710 CF98 AF9B 327B B80F
http://newartisans.com 60E1 46C4 BD1A 7AC1 4BA2
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Performing a 4 way diff with ediff
2017-01-14 0:55 ` John Wiegley
@ 2017-01-20 11:19 ` Philipp Stephani
0 siblings, 0 replies; 3+ messages in thread
From: Philipp Stephani @ 2017-01-20 11:19 UTC (permalink / raw)
To: Dan LaManna, emacs-devel
[-- 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 --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-01-20 11:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
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).