(emacs)Combining in Emerge


Next: Fine Points of Emerge Prev: Exiting Emerge Up: Emerge

Combining the Two Versions
--------------------------

   Sometimes you want to keep *both* alternatives for a particular
locus.  To do this, use `x c', which edits the merge buffer like this:

     #ifdef NEW
     VERSION FROM A FILE
     #else /* NEW */
     VERSION FROM B FILE
     #endif /* NEW */

While this example shows C preprocessor conditionals delimiting the two
alternative versions, you can specify the strings you want by setting
the variable `emerge-combine-versions-template' to a string of your
choice.  In the string, `%a' says where to put version A, and `%b' says
where to put version B.  The default setting, which produces the
results shown above, looks like this:

     "#ifdef NEW\n%a#else /* NEW */\n%b#endif /* NEW */\n"


automatically generated by info2www