From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.help Subject: Re: ediff to combine A and B Date: Fri, 16 Jan 2015 10:10:49 -0500 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1421421097 17643 80.91.229.3 (16 Jan 2015 15:11:37 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 16 Jan 2015 15:11:37 +0000 (UTC) To: help-gnu-emacs@gnu.org Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Fri Jan 16 16:11:36 2015 Return-path: Envelope-to: geh-help-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YC8Yi-0005nO-Du for geh-help-gnu-emacs@m.gmane.org; Fri, 16 Jan 2015 16:11:36 +0100 Original-Received: from localhost ([::1]:56102 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YC8Yc-0002oq-Ka for geh-help-gnu-emacs@m.gmane.org; Fri, 16 Jan 2015 10:11:30 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45547) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YC8YL-0002mu-3l for help-gnu-emacs@gnu.org; Fri, 16 Jan 2015 10:11:13 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YC8YH-0008N9-UC for help-gnu-emacs@gnu.org; Fri, 16 Jan 2015 10:11:13 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:49529) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YC8YH-0008N0-ND for help-gnu-emacs@gnu.org; Fri, 16 Jan 2015 10:11:09 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1YC8YG-0005dk-Mo for help-gnu-emacs@gnu.org; Fri, 16 Jan 2015 16:11:08 +0100 Original-Received: from 184.175.10.11 ([184.175.10.11]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 16 Jan 2015 16:11:08 +0100 Original-Received: from monnier by 184.175.10.11 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 16 Jan 2015 16:11:08 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 9 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 184.175.10.11 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) Cancel-Lock: sha1:hL3F86VtIB9Zf19shfKwG7tstkY= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Original-Sender: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.help:102114 Archived-At: > Is there any way how in ediff join the differences of each buffer wrt > ancestor and apply those on bufferC? I don't use ediff for that. Instead I arrange for the conflict to appear as diff3 markers, so I can use smerge-mode where I can do things like smerge-keep-all. Stefan