[Top][All Lists]

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

Confused by Ediff merging

From: golliher
Subject: Confused by Ediff merging
Date: Fri, 24 Nov 2006 11:26:22 -0800 (PST)

I think I am missing something about Ediff.  I tried to use it today to merge
.emacs files from two separate hosts.   After a session with
ediff-merger-buffers I am left with a ediff-merge buffer, but it is
sprinkled with lines like:

<<<<<<< variant A
>>>>>>> variant B
======= end

around the regions that I merged from the source files.

I would like to have that same buffer only without those additions.  I could
search and delete them, but I can't help but think I'm missing something
fundamental about ediff-merge.   The official Ediff manual hasn't been

So two questions:

1) Anyone know what I'm doing wrong?
2) Anyone know of a good merging tutorial?
View this message in context:
Sent from the Emacs - Help mailing list archive at

reply via email to

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