From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Subhan Michael Tindall Newsgroups: gmane.emacs.help Subject: RE: ediff to combine A and B Date: Fri, 16 Jan 2015 16:27:01 +0000 Message-ID: <18ef97fbf1624c8eba9985d45e4be166@fcmailsvr2.familycareinc.org> References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1421425646 17243 80.91.229.3 (16 Jan 2015 16:27:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 16 Jan 2015 16:27:26 +0000 (UTC) To: 'David Belohrad' , help-gnu-emacs Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Fri Jan 16 17:27:26 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 1YC9k5-0007Pv-Pc for geh-help-gnu-emacs@m.gmane.org; Fri, 16 Jan 2015 17:27:25 +0100 Original-Received: from localhost ([::1]:56368 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YC9k5-0003Lc-48 for geh-help-gnu-emacs@m.gmane.org; Fri, 16 Jan 2015 11:27:25 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59636) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YC9jq-0003LW-DN for help-gnu-emacs@gnu.org; Fri, 16 Jan 2015 11:27:11 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YC9jm-0000EZ-9E for help-gnu-emacs@gnu.org; Fri, 16 Jan 2015 11:27:10 -0500 Original-Received: from outbound.familycareinc.org ([207.170.205.147]:40154) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YC9jm-0000E5-3H for help-gnu-emacs@gnu.org; Fri, 16 Jan 2015 11:27:06 -0500 X-IronPort-AV: E=Sophos;i="5.09,411,1418112000"; d="scan'208";a="2616441" Original-Received: from fcmailsvr3.familycareinc.org ([10.0.1.3]) by fcspamapp1.familycareinc.org with ESMTP; 16 Jan 2015 08:27:05 -0800 Original-Received: from FCMAILSVR2.familycareinc.org (10.0.1.9) by fcmailsvr3.familycareinc.org (10.0.1.3) with Microsoft SMTP Server (TLS) id 15.0.995.29; Fri, 16 Jan 2015 08:27:03 -0800 Original-Received: from FCMAILSVR2.familycareinc.org ([fe80::55f1:10a1:94d8:d4cc]) by fcmailsvr2.familycareinc.org ([fe80::55f1:10a1:94d8:d4cc%18]) with mapi id 15.00.0995.028; Fri, 16 Jan 2015 08:27:02 -0800 Thread-Topic: ediff to combine A and B Thread-Index: AQHQMXHt7l1XJqt0s0mYIoCTeYW1oJzC72Vw In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-vipre-scanned: 47FB0F84008F6647FB10D1 x-originating-ip: [10.0.1.170] X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 207.170.205.147 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:102115 Archived-At: See: ediff3 This should do the job for you. > -----Original Message----- > From: help-gnu-emacs-bounces+subhant=3Dfamilycareinc.org@gnu.org > [mailto:help-gnu-emacs-bounces+subhant=3Dfamilycareinc.org@gnu.org] On > Behalf Of David Belohrad > Sent: Friday, January 16, 2015 1:51 AM > To: help-gnu-emacs > Subject: ediff to combine A and B > = > Dear all, > = > somebody can help? I'm using ediff with ORG files quite often. Usually any > writing into journal.org results in merge conflicts, which have to be res= olved > manually. > = > Most of the time the resolve involves joining the bufferA and bufferB into > the bufferC. For the moment what I do is, that I use 'a' or 'b' > keystroke to make one of those buffers copied into bufferC, and _then > manually_ copy the content of the other buffer into the bufferC. > = > Is there any way how in ediff join the differences of each buffer wrt anc= estor > and apply those on bufferC? > = > many thanks > david This message is intended for the sole use of the individual and entity to w= hich it is addressed and may contain information that is privileged, confid= ential and exempt from disclosure under applicable law. If you are not the = intended addressee, nor authorized to receive for the intended addressee, y= ou are hereby notified that you may not use, copy, disclose or distribute t= o anyone the message or any information contained in the message. If you ha= ve received this message in error, please immediately advise the sender by = reply email and delete the message. Thank you.