From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Dan LaManna Newsgroups: gmane.emacs.devel Subject: Performing a 4 way diff with ediff Date: Fri, 13 Jan 2017 19:27:43 -0500 Message-ID: <1484353663.1309303.847275520.34F44A3C@webmail.messagingengine.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Trace: blaine.gmane.org 1484353680 9071 195.159.176.226 (14 Jan 2017 00:28:00 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 14 Jan 2017 00:28:00 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jan 14 01:27:56 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cSCCJ-0001k3-Bx for ged-emacs-devel@m.gmane.org; Sat, 14 Jan 2017 01:27:55 +0100 Original-Received: from localhost ([::1]:45861 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cSCCM-00069h-4p for ged-emacs-devel@m.gmane.org; Fri, 13 Jan 2017 19:27:58 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55536) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cSCCF-00069R-84 for emacs-devel@gnu.org; Fri, 13 Jan 2017 19:27:52 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cSCCA-0004NO-9r for emacs-devel@gnu.org; Fri, 13 Jan 2017 19:27:51 -0500 Original-Received: from out2-smtp.messagingengine.com ([66.111.4.26]:40367) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cSCCA-0004NG-5h for emacs-devel@gnu.org; Fri, 13 Jan 2017 19:27:46 -0500 Original-Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id 31E582090D for ; Fri, 13 Jan 2017 19:27:44 -0500 (EST) Original-Received: from web5 ([10.202.2.215]) by compute2.internal (MEProxy); Fri, 13 Jan 2017 19:27:44 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=smtpout; bh=heWegBK2CyNKV6RSHD57Ng0tS ek=; b=oYxFV3NaLymkEHki+Ig6TqNmAlpVA6JYMvGULfLiDWUv390bysQqzFDs5 FN4iUO5ig/NEMWWAG/gMrIzRV6b+ExpSA0XFkb62EHOBtGZbu+3nD2t+h9Fi/23+ +LTuTArJLQM+7UDQKlvbzGu+I7paAa6Boyxwx1FL2u3I9qa53g= X-ME-Sender: Original-Received: by mailuser.nyi.internal (Postfix, from userid 99) id 0279E6ABF3; Fri, 13 Jan 2017 19:27:43 -0500 (EST) X-Mailer: MessagingEngine.com Webmail Interface - ajax-d492654e X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.111.4.26 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:211254 Archived-At: 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