From: David Belohrad <david@belohrad.ch>
To: "help-gnu-emacs" <help-gnu-emacs@gnu.org>
Subject: ediff to combine A and B
Date: Fri, 16 Jan 2015 10:50:33 +0100 [thread overview]
Message-ID: <uaxlhl39hqu.fsf@beesknees.cern.ch> (raw)
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 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
david
next reply other threads:[~2015-01-16 9:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-16 9:50 David Belohrad [this message]
2015-01-16 15:10 ` ediff to combine A and B Stefan Monnier
2015-01-16 16:27 ` Subhan Michael Tindall
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=uaxlhl39hqu.fsf@beesknees.cern.ch \
--to=david@belohrad.ch \
--cc=help-gnu-emacs@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).