On Wed, Feb 09, 2005 at 09:19:44AM -0700, Eric Jensen wrote: > Moving from buffer to buffer was easy to find out how to do, it is > merging two buffers into one that I couldn't do. For example, Buffer A > has code snippet 1 and 2, Buffer B has code snippet 2 and 3. I need > Buffer C to have code snippets 1, 2, and 3. But I don't think that > functionality is there. Seems I can only have A or B in C, not both. I > just save the 3rd buffer to another file and manual merge the more > complicated sections.
That's the way to do it. Emacs does not know which snippets you want where. It does not read your mind. It's good, but not that good. :-) > > Eric > > Charles Curley wrote: > > >On Tue, Feb 08, 2005 at 03:24:27PM -0700, Eric Jensen wrote: > > > > > >>Working on merging two very similar code bases and I am wanting to use > >>Emac's Ediff, it seems to be pretty handy. Having a hard time merging A > >>and B into C though. I have read through the manual and it says how to > >>move A to C and B to C, but not parts of A to C and parts of B to C. > >>Anybody have any experience with this? This is the only project I've > >>used Emacs on and Vim taught me that randomly mashing buttons will get > >>you nowhere. ;) > >> > >> > > > >Another thread hijacker, gnrrrr.... > > > > > >When doing a three-way ediff in Emacs, you move diffs by indicating > >both the source and destination buffers. So to move from A to B, "A > >B". To move from A to C, "A C". Etc. You can get more help from the > >ediff frame with "?". > > -- Charles Curley /"\ ASCII Ribbon Campaign Looking for fine software \ / Respect for open standards and/or writing? X No HTML/RTF in email http://www.charlescurley.com / \ No M$ Word docs in email Key fingerprint = CE5C 6645 A45A 64E4 94C0 809C FFF6 4C48 4ECD DFDB
pgpannpgX2ecO.pgp
Description: PGP signature
.===================================. | This has been a P.L.U.G. mailing. | | Don't Fear the Penguin. | | IRC: #utah at irc.freenode.net | `==================================='
