Next: Fine Points of Emerge, Previous: Exiting Emerge, Up: Emerge [Contents][Index]
Áê°ã²Õ½ê¤Ë¤è¤Ã¤Æ¤Ï¡¢Î¾Êý¤ÎÈǤò»Ä¤·¤¿¤¤¤³¤È¤â¤¢¤ë¤Ç¤·¤ç¤¦¡£ ¤½¤Î¤è¤¦¤Ê¾ì¹ç¤Ë¤Ï¡¢x c¤ò»È¤¤¤Þ¤¹¡£ ¤¹¤ë¤È¡¢Ê»¹ç¥Ð¥Ã¥Õ¥¡¤Ï¤Ä¤®¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
#ifdef NEW version from A buffer #else /* not NEW */ version from B buffer #endif /* not NEW */
¤³¤ÎÎã¤Ç¤Ï¡¢2¤Ä¤ÎÈǤòC¤Î¥×¥ê¥×¥í¥»¥Ã¥µ¤Î¾ò·ïÀá¤Çʬ¤±¤Æ¤¤¤Þ¤¹¤¬¡¢
ÊÑ¿ôemerge-combine-versions-template
¤Ë¹¥¤ß¤Îʸ»úÎó¤òÀßÄꤹ¤ì¤Ð¡¢
¤³¤Î¥³¥Þ¥ó¥É¤Ç»ÈÍѤ¹¤ëʸ»úÎó¤ò»ØÄê¤Ç¤¤Þ¤¹¡£
¤³¤Îʸ»úÎóÆâ¤Ç¤Ï¡¢AÈǤΥƥ¥¹¥È¤òÃÖ¤¯²Õ½ê¤Ë¤Ï‘%a’¤ò¡¢
BÈǤΤòÃÖ¤¯²Õ½ê¤Ë¤Ï‘%b’¤ò»ØÄꤷ¤Þ¤¹¡£
¾å¤Ë¼¨¤·¤¿·ë²Ì¤òÀ¸¤¸¤ë¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄê¤Ï¤Ä¤®¤Î¤È¤ª¤ê¤Ç¤¹¡£
"#ifdef NEW\n%a#else /* not NEW */\n%b#endif /* not NEW */\n"