help-gnu-emacs
[Top][All Lists]
Advanced

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

Re: Confused by Ediff merging


From: Dieter Wilhelm
Subject: Re: Confused by Ediff merging
Date: Mon, 27 Nov 2006 22:03:42 +0100
User-agent: Gnus/5.11 (Gnus v5.11) Emacs/22.0.50 (gnu/linux)

golliher <address@hidden> writes:

> 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
> enlightening.
>
> So two questions:
>
> 1) Anyone know what I'm doing wrong?

Sorry, no, I'm answering only because nobody else did 8-/

Maybe you are better of with emerge as with ediff?  Why could ediff be
better in this situation?

-- 
    Best wishes

    H. Dieter Wilhelm
    Darmstadt, Germany




reply via email to

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