Next: Submodes of Emerge, Up: Emerge [Contents][Index]
°Ê²¼¤Î4¤Ä¤Î¥³¥Þ¥ó¥É¤Î¤¤¤º¤ì¤«¤Çemerge¤ò¼Â¹Ô¤·¤Þ¤¹¡£
»ØÄꤷ¤¿2¤Ä¤Î¥Õ¥¡¥¤¥ë¤òÊ»¹ç¤¹¤ë¡£
¶¦Ä̤ÎÁÄÀè¤ò»²¾È¤·¤Ê¤¬¤é¡¢»ØÄꤷ¤¿2¤Ä¤Î¥Õ¥¡¥¤¥ë¤òÊ»¹ç¤¹¤ë¡£
2¤Ä¤Î¥Ð¥Ã¥Õ¥¡¤òÊ»¹ç¤¹¤ë¡£
3ÈÖÌܤΥХåե¡¤ËÆþ¤Ã¤Æ¤¤¤ë¶¦Ä̤ÎÁÄÀè¤ò»²¾È¤·¤Ê¤¬¤é¡¢2¤Ä¤Î¥Ð¥Ã¥Õ¥¡¤òÊ»¹ç¤¹¤ë¡£
emerge¥³¥Þ¥ó¥É¤Ï¡¢2¤Ä¤Î¥Õ¥¡¥¤¥ë¡¢¤¢¤ë¤¤¤Ï¡¢2¤Ä¤Î¥Ð¥Ã¥Õ¥¡¤òÈæ³Ó¤·¤Æ¡¢ Èæ³Ó·ë²Ì¤ò3¤Ä¤Î¥Ð¥Ã¥Õ¥¡¡¢¤Ä¤Þ¤ê¡¢ ³ÆÆþÎϥƥ¥¹¥È¤Ë1¤Ä¤º¤Ä¡ÊA¥Ð¥Ã¥Õ¥¡¤ÈB¥Ð¥Ã¥Õ¥¡¡Ë¤È¡¢ Ê»¹ç¤ò¼Â»Ü¤¹¤ë¥Ð¥Ã¥Õ¥¡¡ÊÊ»¹ç¥Ð¥Ã¥Õ¥¡¡Ë¤Ëɽ¼¨¤·¤Þ¤¹¡£ Ê»¹ç¥Ð¥Ã¥Õ¥¡¤Ë¤Ï¡¢Èæ³Ó¤Ë¤è¤Ã¤ÆÆÀ¤é¤ì¤ëº¹Ê¬¤À¤±¤Ç¤Ê¤¯¡¢ Ê»¹ç¤·¤¿¥Æ¥¥¹¥ÈÁ´ÂΤ¬É½¼¨¤µ¤ì¤Þ¤¹¡£ 2¤Ä¤ÎÆþÎϥƥ¥¹¥È¤¬Áê°ã¤·¤Æ¤¤¤ë²Õ½ê¤Ë¤Ä¤¤¤Æ¤Ï¡¢ ¤É¤Á¤é¤Î¥Æ¥¥¹¥È¤òÊ»¹ç¥Ð¥Ã¥Õ¥¡¤Ë´Þ¤á¤ë¤«ÁªÂò¤Ç¤¤Þ¤¹¡£
´û¸¤Î¥Ð¥Ã¥Õ¥¡¤òÆþÎϸ»¤È¤¹¤ëemerge¥³¥Þ¥ó¥É¤Ç¤Ï¡¢ ÆþÎϥХåե¡¤¬¥Ê¥í¥¤¥ó¥°¤µ¤ì¤Æ¤¤¤ë¤È¡¢ ¥Ð¥Ã¥Õ¥¡¤Î»²¾È²Äǽ¤ÊÉôʬ¤À¤±¤ò»È¤¤¤Þ¤¹¡Êsee Narrowing¡Ë¡£
Ê»¹ç¤·¤¿¤¤2¤Ä¤Î¥Æ¥¥¹¥È¤Î¤â¤È¤Ç¤¢¤ë¶¦Ä̤ÎÁÄÀè¤Ë¤¢¤¿¤ëÈǤòÍøÍѤǤ¤ë¤È¤¤Ë¤Ï¡¢ emerge¤Ï¤½¤ì¤ò»È¤Ã¤Æ¤É¤Á¤é¤ÎÁªÂò»è¤¬Àµ¤·¤¤¤Î¤«¿ä¬¤·¤Þ¤¹¡£ °ìÊý¤ÎÆþÎϤÈÁÄÀè¤È¤Î°ìÃ×Éôʬ¤¬¤É¤³¤«¤Ë¤¢¤ì¤Ð¡¢ ¤â¤¦°ìÊý¤ÎÆþÎϤˤÏÊ»¹ç·ë²Ì¤Ë»Ä¤¹¤Ù¤°Õ¿ÞŪ¤ÊÊѹ¹¤¬¤Ê¤µ¤ì¤Æ¤¤¤ë¤È¿ä¬¤·¤Þ¤¹¡£ ¶¦Ä̤ÎÁÄÀè¤Î¥Æ¥¥¹¥È¤ò»ØÄꤹ¤ë¤Ë¤Ï¡¢ ̾Á°¤Ë‘with-ancestor’¤ÎÉÕ¤¤¤¿¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£ ¤³¤ì¤é¤Î¥³¥Þ¥ó¥É¤Ï¡¢AÈÇ¡¢BÈÇ¡¢¶¦Ä̤ÎÁÄÀè¤ËÂбþ¤¹¤ë 3¤Ä¤Î¥Õ¥¡¥¤¥ë̾¤«¥Ð¥Ã¥Õ¥¡Ì¾¤òÆÉ¤ß¼è¤ê¤Þ¤¹¡£
ÆþÎϤòÈæ³Ó¤·¤Æ¥Ð¥Ã¥Õ¥¡¤Î½àÈ÷¤ò½ª¤¨¤ë¤È¡¢¤Ä¤®¤ÏÂÐÏÃŪ¤ÊÊ»¹çºî¶È¤¬»Ï¤Þ¤ê¤Þ¤¹¡£ Ê»¹ç¥Ð¥Ã¥Õ¥¡¤ÇÆÃÊ̤ÊÊ»¹ç¥³¥Þ¥ó¥É¤òÂǤäÆÊ»¹çºî¶È¤òÀ©¸æ¤·¤Þ¤¹¡£ Ê»¹ç¥Ð¥Ã¥Õ¥¡¤Ë¤Ï¡¢Ã±¤Ê¤ëº¹Ê¬¤Ç¤Ï¤Ê¤¯Ê»¹ç¤·¤¿¥Æ¥¥¹¥ÈÁ´ÂΤ¬É½¼¨¤µ¤ì¤Þ¤¹¡£ ÆþÎϥƥ¥¹¥È¤Î³ÆÁê°ã²Õ½ê¤ËÂФ·¤Æ¡¢¤É¤Á¤é¦¤ò»Ä¤¹¤«ÁªÂò¤·¤¿¤ê¡¢ ξ¼Ô¤ò¤â¤È¤Ë¤·¤ÆÊÔ½¸¤Ç¤¤Þ¤¹¡£
Ê»¹ç¥Ð¥Ã¥Õ¥¡¤Ç¤Ï¡¢emerge¥â¡¼¥É¤È¸Æ¤Ð¤ì¤ëÆÃÊ̤ʥ᥸¥ã¡¼¥â¡¼¥É¤¬»È¤ï¤ì¡¢ ¤³¤ì¤é¤òÁªÂò¤¹¤ë¥³¥Þ¥ó¥É¤¬¤¢¤ê¤Þ¤¹¡£ ¤â¤Á¤í¤ó¡¢Ä̾ï¤ÎEmacs¥³¥Þ¥ó¥É¤Ç¥Ð¥Ã¥Õ¥¡¤òÊÔ½¸¤¹¤ë¤³¤È¤â¤Ç¤¤Þ¤¹¡£
emerge¤ÎÃí°Õ¤Ï¡¢¤¤¤Ä¤Ç¤âÃíÌÜÁê°ã²Õ½ê¤È¸Æ¤Ð¤ì¤ë Áê°ã²Õ½ê¤Ë¸þ¤±¤é¤ì¤Æ¤¤¤Þ¤¹¡£ 3¤Ä¤Î¥Ð¥Ã¥Õ¥¡Æâ¤Ç¤Ï¡¢ÃíÌÜÁê°ãÅÀ¤Ï¤Ä¤®¤Î¤è¤¦¤Ë°õ¤¬ÉÕ¤±¤é¤ì¤Þ¤¹¡£
vvvvvvvvvvvvvvvvvvvv text that differs ^^^^^^^^^^^^^^^^^^^^
emerge¤Ï¤¹¤Ù¤Æ¤ÎÁê°ã²Õ½ê¤Ë½ç¤ËÈÖ¹æ¤ò¤Õ¤ê¤Þ¤¹¡£ ¤µ¤é¤Ë¡¢¥â¡¼¥É¹Ô¤Ë¤Ï¤Ä¤Í¤ËÃíÌÜÁê°ã²Õ½ê¤ÎÈֹ椬ɽ¼¨¤µ¤ì¤Þ¤¹¡£
Ä̾ʻ¹ç¥Ð¥Ã¥Õ¥¡¤ÏAÈÇ¤ÎÆâÍÆ¤Ç»Ï¤Þ¤ê¤Þ¤¹¡£ ¤·¤«¤·¡¢AÈÇ¤ÎÆâÍÆ¤¬¶¦Ä̤ÎÁÄÀè¤ÎÆâÍÆ¤È°ìÃפ¹¤ë¤È¤¤Ë¤Ï¡¢ Ê»¹ç¥Ð¥Ã¥Õ¥¡¤ÏBÈÇ¤ÎÆâÍÆ¤Ç»Ï¤Þ¤ê¤Þ¤¹¡£
emerge¤ò½ª¤¨¤ë¤È¡¢Ê»¹ç¥Ð¥Ã¥Õ¥¡¤Ë¤Ï¤½¤Î»þÅÀ¤ÎÊ»¹çºÑ¤ß¥Æ¥¥¹¥È¤¬»Ä¤ê¤Þ¤¹¡£
emerge½ªÎ»»þ¤Ë¤Ï¡¢C-x C-w¤Ç¥Õ¥¡¥¤¥ë¤ËÊݸ¤Ç¤¤Þ¤¹¡£
emerge-files
¤äemerge-files-with-ancestor
¤Ë
¿ô°ú¿ô¤ò»ØÄꤹ¤ë¤È¡¢¥ß¥Ë¥Ð¥Ã¥Õ¥¡¤Ç½ÐÎÏ¥Õ¥¡¥¤¥ë̾¤òÆÉ¤ß¼è¤ê¤Þ¤¹¡£
¡Ê¤É¤Á¤é¤Î¾ì¹ç¤Ç¤â¡¢¤³¤ì¤¬¤¤¤Á¤Ð¤óºÇ¸å¤Ëʹ¤«¤ì¤ë¥Õ¥¡¥¤¥ë̾¡£¡Ë
¤¹¤ë¤È¡¢emerge½ªÎ»»þ¤Ë¤Ï¡¢Ê»¹çºÑ¤ß¤Î¥Æ¥¥¹¥È¤¬¤½¤Î½ÐÎÏ¥Õ¥¡¥¤¥ë¤ËÊݸ¤µ¤ì¤Þ¤¹¡£
emerge¤ò½ª¤¨¤ë¤È¡¢Ä̾emerge¥³¥Þ¥ó¥É¤¬Ê»¹ç¥Ð¥Ã¥Õ¥¡¤ò¥Õ¥¡¥¤¥ë¤ËÊݸ¤·¤Þ¤¹¡£ emerge¤òC-]¤Ç¥¢¥Ü¡¼¥È¤¹¤ë¤Èemerge¥³¥Þ¥ó¥É¤ÏÊ»¹ç¥Ð¥Ã¥Õ¥¡¤òÊݸ¤·¤Þ¤»¤ó¤¬¡¢ ɬÍפʤé¤Ð¥æ¡¼¥¶¡¼¼«¿È¤ÇÊݸ¤Ç¤¤Þ¤¹¡£