all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Dan LaManna <me@danlamanna.com>
To: emacs-devel@gnu.org
Subject: Performing a 4 way diff with ediff
Date: Fri, 13 Jan 2017 19:27:43 -0500	[thread overview]
Message-ID: <1484353663.1309303.847275520.34F44A3C@webmail.messagingengine.com> (raw)

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



             reply	other threads:[~2017-01-14  0:27 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-14  0:27 Dan LaManna [this message]
2017-01-14  0:55 ` Performing a 4 way diff with ediff John Wiegley
2017-01-20 11:19   ` Philipp Stephani

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=1484353663.1309303.847275520.34F44A3C@webmail.messagingengine.com \
    --to=me@danlamanna.com \
    --cc=emacs-devel@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. 
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.