Previous: Merging Incomplete Lines, Up: diff3 Merging   [Contents][Index]


8.5 Êѹ¹¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤ÎÊݸ

ÅÁÅýŪ¤ÊUnix diff3¤Ï¡¤Êѹ¹¤òÊݸ¤¹¤ë¥³¥Þ¥ó¥É‘w’¤È‘q’ ¤ò¸åÃÖ¤·¤Ê¤¤ed¥¹¥¯¥ê¥×¥È¤òÀ¸À®¤·¤Þ¤¹¡¥System V diff3 ¤Ï¡¤¤³¤ì¤é¤ÎÄɲå³¥Þ¥ó¥É¤òÀ¸À®¤·¤Þ¤¹¡¥GNU diff3¤ÏÄ̾ÅÁ ÅýŪ¤ÊUnix diff3¤Î¤è¤¦¤Ëưºî¤·¤Þ¤¹¤¬¡¤-i¥ª¥×¥·¥ç¥ó¤ò ÍѤ¤¤ë¤È¡¤System V diff3¤Î¤è¤¦¤Ëưºî¤·¡¤‘w’¤È‘q’¥³¥Þ ¥ó¥É¤ò¸åÃÖ¤·¤Þ¤¹¡¥

-i¥ª¥×¥·¥ç¥ó¤Ï¡¤ed¥¹¥¯¥ê¥×¥È¥ª¥×¥·¥ç¥ó¤Î -AeExX3¤Î°ì¤Ä¤òÍ׵ᤷ¡¤¥Þ¡¼¥¸¤µ¤ì¤¿½ÐÎϤΥª¥×¥·¥ç¥ó-m ¤È¸ß´¹À­¤¬¤¢¤ê¤Þ¤»¤ó¡¥