From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Philipp Stephani Newsgroups: gmane.emacs.devel Subject: Re: Performing a 4 way diff with ediff Date: Fri, 20 Jan 2017 11:19:17 +0000 Message-ID: References: <1484353663.1309303.847275520.34F44A3C@webmail.messagingengine.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=94eb2c03c8ceacb2b4054684d2af X-Trace: blaine.gmane.org 1484911209 4425 195.159.176.226 (20 Jan 2017 11:20:09 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 20 Jan 2017 11:20:09 +0000 (UTC) To: Dan LaManna , emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 20 12:20:04 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 1cUXEi-0000jE-1w for ged-emacs-devel@m.gmane.org; Fri, 20 Jan 2017 12:20:04 +0100 Original-Received: from localhost ([::1]:53783 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cUXEm-0001j6-VR for ged-emacs-devel@m.gmane.org; Fri, 20 Jan 2017 06:20:08 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54545) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cUXE9-0001j1-MB for emacs-devel@gnu.org; Fri, 20 Jan 2017 06:19:30 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cUXE8-0000cS-K7 for emacs-devel@gnu.org; Fri, 20 Jan 2017 06:19:29 -0500 Original-Received: from mail-ot0-x233.google.com ([2607:f8b0:4003:c0f::233]:33501) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cUXE8-0000cE-Eu for emacs-devel@gnu.org; Fri, 20 Jan 2017 06:19:28 -0500 Original-Received: by mail-ot0-x233.google.com with SMTP id 73so53394426otj.0 for ; Fri, 20 Jan 2017 03:19:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=lzKlMnsb4e09Dcw1gP6tuB04bbxcabpSabXsdy/71xc=; b=KJZZnzchRYe+nRfyuFUFJc9awLNeaJ9rayk6k2VcVTQNoUknsugKIHn1ZZGrROIjOf sb4IbEb47heYZl5tPlhPD6wwVhYw5OPEQeQ00ZjCI8LKcCtG6QsqRIT8k8VIjazd23/O LvkSaMiIzByzRmV1YZMJVrfHBgQa7BBRWHiAoBCkeOvWcwrH0H+7tIGWgPvaWSARErz8 kFb3aRh2AdJd+i3Pxt0OkQ39O0cs1tBFuakJ+6Az6wRp0IpaejPPLd7UBD37R4xGSNnN RIQMUPk9i1y7bPwjkWYEfJZhwXzOgeYkRgAn7ROLS7J+zwvixCh6Ydr13UgLqHWFz6am emDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=lzKlMnsb4e09Dcw1gP6tuB04bbxcabpSabXsdy/71xc=; b=Goy+sd96spSOm0dzdfMoQUzze1eaFUkKkr7LvVM541nzAHAuR6dEiPxWLeJ1cL00V3 658I5whhbC5WbJT0jatQ4rkuxJ1h3A4HnbKOabtRyShQDlynKbXBLmbyHE1MqAXho3AX Azpl1iK1M+1rxnGhX5JjR0IWGqr28fDmPX/nIjNpLxVgQJGEBelCZlnf6rWC9NzuPjob KXRV0oFdeD78UUpc2tcoVu+CiZ2Sp7FBLSRVjsBSlxWvIJx01ztvrNft3dEz1kBRILU+ O3+l9joKuHdga2NdgcIrc0gq6AbdAUggb76IT2yiEu8zxusx2uQQpp3TBtmW2ujnrOmu XZHw== X-Gm-Message-State: AIkVDXL9qy0laUv4va4yLWHZ4df448FTmveSEgijMVDseYnxeNjlnUve27RTYDfyc9AJjqyp6GX6cvqaX/rarQ== X-Received: by 10.157.3.209 with SMTP id f75mr6231596otf.261.1484911167709; Fri, 20 Jan 2017 03:19:27 -0800 (PST) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:4003:c0f::233 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:211422 Archived-At: --94eb2c03c8ceacb2b4054684d2af Content-Type: text/plain; charset=UTF-8 John Wiegley schrieb am Sa., 14. Jan. 2017 um 01:55 Uhr: > >>>>> "DL" == Dan LaManna 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 --94eb2c03c8ceacb2b4054684d2af Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable


John W= iegley <jwiegley@gmail.com>= schrieb am Sa., 14. Jan. 2017 um 01:55=C2=A0Uhr:
>>>>> "DL" =3D=3D Dan LaManna <<= a href=3D"mailto:me@danlamanna.com" class=3D"gmail_msg" target=3D"_blank">m= e@danlamanna.com> writes:

DL> I've been using ediff to resolve merge conflicts in git and it h= as 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 functio= nality
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/155875= 95/can-ediff-merge-simultaneously-show-the-ancestor-a-b-and-merge-buffers

--94eb2c03c8ceacb2b4054684d2af--