¤Á¤ç¤Ã¤È¤·¤¿¥ß¥¹¤Ç¡¢1¤Ä¤Î¥×¥í¥°¥é¥à¤«¤é2¤Ä¤ÎÊ̤ÎÈǤò ºî¤Ã¤Æ¤·¤Þ¤¦¤³¤È¤â¤¢¤ê¤Þ¤¹¡£ ¤³¤Îº®Í𤷤¿¾õÂÖ¤ò¼ý½¦¤¹¤ë¤Ë¤Ï¡¢¤½¤ì¤é¤òÊ»¹ç¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ emerge¤ò»È¤¦¤È¡¢Ê»¹çºî¶È¤¬Íưפˤʤê¤Þ¤¹¡£ ¼êư¤ÇÈæ³Ó¤¹¤ë¥³¥Þ¥ó¥É¤Ë¤Ä¤¤¤Æ¤Ï¡¢Comparing Files¤È Emerge in The Ediff Manual¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
• Overview of Emerge: | How to start Emerge. Basic concepts. | |
• Submodes of Emerge: | Fast mode vs. Edit mode. Skip Prefers mode and Auto Advance mode. | |
• State of Difference: | You do the merge by specifying state A or B for each difference. | |
• Merge Commands: | Commands for selecting a difference, changing states of differences, etc. | |
• Exiting Emerge: | What to do when you’ve finished the merge. | |
• Combining in Emerge: | How to keep both alternatives for a difference. | |
• Fine Points of Emerge: | Misc. |