[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

ediff to combine A and B

From: David Belohrad
Subject: ediff to combine A and B
Date: Fri, 16 Jan 2015 10:50:33 +0100
User-agent: Notmuch/0.18~rc0+2~gbc64cdc ( Emacs/24.4.1 (x86_64-pc-linux-gnu)

Dear all,

somebody can help? I'm using ediff with ORG files quite often. Usually
any writing into results in merge conflicts, which have to
be resolved 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
ancestor and apply those on bufferC?

many thanks

reply via email to

[Prev in Thread] Current Thread [Next in Thread]