From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: John Wiegley Newsgroups: gmane.emacs.devel Subject: Re: Performing a 4 way diff with ediff Date: Fri, 13 Jan 2017 16:55:36 -0800 Message-ID: References: <1484353663.1309303.847275520.34F44A3C@webmail.messagingengine.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1484355346 24274 195.159.176.226 (14 Jan 2017 00:55:46 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 14 Jan 2017 00:55:46 +0000 (UTC) User-Agent: Gnus/5.130016 (Ma Gnus v0.16) Emacs/25.1.91 (darwin) Cc: emacs-devel@gnu.org To: Dan LaManna Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jan 14 01:55:39 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 1cSCd4-0005CP-La for ged-emacs-devel@m.gmane.org; Sat, 14 Jan 2017 01:55:34 +0100 Original-Received: from localhost ([::1]:45927 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cSCd9-00063u-9h for ged-emacs-devel@m.gmane.org; Fri, 13 Jan 2017 19:55:39 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58262) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cSCcU-00063p-M7 for emacs-devel@gnu.org; Fri, 13 Jan 2017 19:54:59 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cSCcQ-00040f-Do for emacs-devel@gnu.org; Fri, 13 Jan 2017 19:54:58 -0500 Original-Received: from mail-io0-x22f.google.com ([2607:f8b0:4001:c06::22f]:35393) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cSCcQ-00040b-9h for emacs-devel@gnu.org; Fri, 13 Jan 2017 19:54:54 -0500 Original-Received: by mail-io0-x22f.google.com with SMTP id j18so56263084ioe.2 for ; Fri, 13 Jan 2017 16:54:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:in-reply-to:date:message-id:references :user-agent:mail-followup-to:mime-version; bh=YWq+HIZ4YyT7/J2mTnlsi5B8Y3zLSWi3/u8RT+j9GZE=; b=bj2WLc3pkQGzAtDPvJD5RwT73ftvUg0g/SO0WNbv4wAilyu1aIOQowUgKVKTMWzhKj d7vBUoNnin4mzlTO5T3Iv5udwOZbKZNpKlzmnezqSrR/wjdqZAC0RFsv71K7ZRoBrKxx 5g7mTSYf0AfoVISt1gdscuQckN1DKfigEAlgxat64ozG3kHE7sfEWojM4EzIUBRYmAdW WAVmRcKLJkxAsQ9fWR5CSSXIyQC4PEtiZI6/44vO3x7SLR3iSFm85MuuO0CJvfXaVN1I Vhw4rsA3nUd2IfmWIR05t0q8WmKJeuLyNhej7tYXQXAcHuN1ueYik8dEZ2mjDQSrcp3S Dgzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:date:message-id :references:user-agent:mail-followup-to:mime-version; bh=YWq+HIZ4YyT7/J2mTnlsi5B8Y3zLSWi3/u8RT+j9GZE=; b=lyAluyz/s7Ccm1yGDFgnqbf2Y/rjY4Y9qW1mUoyX1Lea3ZW8ScP09jnrwBOdV46JZV UO/xYKXY/a4BUTimzBZ0z0SGb9uFZoLJQYtNFuw3AHin74KmUIt++VNi3km8tY+Z3VIu e2lbSwYWvXji9Drn13AU0GxGf3SLdYu0lumQ+IUW0ohlseV/g4TrXNUaThLIind9cc54 vVZbNNi8MHDXlCs0oRY98quITYvRvFHSfOH622+X+1PhiFGOip+UPAiWgg2hOhErtlQN oEXlETyTzHUoLIr0Sc5gxK1srWK8LgGqsh80VQS1gRt/f9xhLIKVMiIJp6xwR9G5t9FR 2CDA== X-Gm-Message-State: AIkVDXLoZo8ksy1X79i3Yb5E3QjJcY5tH2cbSe7mhKuPudHASG+FE01LZLJrmYk+XBCN1Q== X-Received: by 10.107.140.193 with SMTP id o184mr20668641iod.17.1484355293320; Fri, 13 Jan 2017 16:54:53 -0800 (PST) Original-Received: from Vulcan.local (76-234-69-149.lightspeed.frokca.sbcglobal.net. [76.234.69.149]) by smtp.gmail.com with ESMTPSA id g186sm1790003itb.4.2017.01.13.16.54.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 13 Jan 2017 16:54:52 -0800 (PST) X-Google-Original-From: "John Wiegley" Original-Received: by Vulcan.local (Postfix, from userid 501) id 336BFC7F0F9; Fri, 13 Jan 2017 16:55:38 -0800 (PST) In-Reply-To: <1484353663.1309303.847275520.34F44A3C@webmail.messagingengine.com> (Dan LaManna's message of "Fri, 13 Jan 2017 19:27:43 -0500") Mail-Followup-To: Dan LaManna , emacs-devel@gnu.org X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:4001:c06::22f 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:211255 Archived-At: >>>>> "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 -- John Wiegley GPG fingerprint = 4710 CF98 AF9B 327B B80F http://newartisans.com 60E1 46C4 BD1A 7AC1 4BA2