Re: Confused by Ediff merging

[Perry Smith]

On Nov 27, 2006, at 3:03 PM, Dieter Wilhelm wrote:

> golliher <darrell@golliher.net> 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?

I was going to pitch in but didn't because I didn't have a solid  
suggestion.  I use ediff-buffers -- not ediff-merger-buffers..  You  
might try that.

Perry Smith ( pedz@easesoftware.com )
Ease Software, Inc. ( http://www.easesoftware.com )

Low cost SATA Disk Systems for IBMs p5, pSeries, and RS/6000 AIX systems