[Top][All Lists]

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

Re: Performing a 4 way diff with ediff

From: John Wiegley
Subject: Re: Performing a 4 way diff with ediff
Date: Fri, 13 Jan 2017 16:55:36 -0800
User-agent: Gnus/5.130016 (Ma Gnus v0.16) Emacs/25.1.91 (darwin)

>>>>> "DL" == Dan LaManna <address@hidden> 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:


John Wiegley                  GPG fingerprint = 4710 CF98 AF9B 327B B80F
http://newartisans.com                          60E1 46C4 BD1A 7AC1 4BA2

reply via email to

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