Up: Invoking diff3 [Contents][Index]
diff3
diff3
¤Î¥ª¥×¥·¥ç¥ó°Ê²¼¤Ï¡¤GNU diff3
¤¬¼õ¤±Æþ¤ì¤ë¤¹¤Ù¤Æ¤Î¥ª¥×¥·¥ç¥ó¤Î³µÍפǤ¹¡¥
Ê£¿ô¤Î(°ú¿ô¤ò¼è¤é¤Ê¤¤)ñ°ìʸ»ú¤Î¥ª¥×¥·¥ç¥ó¤ò¡¤Ã±°ì¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¤Îñ¸ì
¤ËÁȤ߹ç¤ï¤»¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡¥
¥Õ¥¡¥¤¥ë¤¬¥Æ¥¥¹¥È¤Î¤è¤¦¤Ë¸«¤¨¤Ê¤¤¾ì¹ç¤Ç¤â¡¤¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤ò¥Æ¥¥¹¥È¤È ¤·¤Æ°·¤¤¡¤¹Ô¤´¤È¤ËÈæ³Ó¤·¤Þ¤¹¡¥See Binary.
older¤«¤éyours¤Ø¤Î¥Þ¡¼¥¸¤µ¤ì¤Æ¤¤¤Ê¤¤¤¹¤Ù¤Æ¤ÎÊѹ¹¤ò¡¤¾×ÆÍ¤·¤¿ Éôʬ¤Î¼þ¤ê¤ò¥«¥Ã¥³ÉդιԤǰϤó¤Çmine¤Ë¼è¤ê¹þ¤ß¤Þ¤¹¡¥See Marking Conflicts.
¥Õ¥¡¥¤¥ë¤ÎÈæ³Ó¤Ç¡¤diff
¤ÎÂå¤ï¤ê¤Ë¥×¥í¥°¥é¥àprogram¤Ë¸ß´¹
À¤Î¤¢¤ëÈæ³Ó¤ò»ÈÍѤ·¤Þ¤¹¡¥
older¤«¤éyours¤Ø¤Î¤¹¤Ù¤Æ¤ÎÊѹ¹¤òmine¤Ë¼è¤ê¹þ¤à
ed
¥¹¥¯¥ê¥×¥È¤òÀ¸À®¤·¤Þ¤¹¡¥See Which Changes.
-e¤Ë»÷¤Æ¤¤¤Þ¤¹¤¬¡¤¥ª¡¼¥Ð¡¼¥é¥Ã¥×¤·¤Æ¤¤¤ëÊѹ¹Éôʬ¤ÎºÇ½é¤È»°ÈÖÌÜ ¤Î¥Õ¥¡¥¤¥ë¤Î¹Ô¤ò¥«¥Ã¥³¤Ç°Ï¤ß¤Þ¤¹¡¥See Marking Conflicts. -E ¤òÍѤ¤¤ë¤È¡¤¥ª¡¼¥Ð¡¼¥é¥Ã¥×¤·¤Æ¤¤¤ëÊѹ¹¤Ï°Ê²¼¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡¥
<<<<<<< mine lines from mine ======= lines from yours >>>>>>> yours
»ÈÍÑÊýË¡¤Î³µÍפò½ÐÎϤ·½ªÎ»¤·¤Þ¤¹¡¥
System V¸ß´¹¤Î¤¿¤á¡¤ed
¥¹¥¯¥ê¥×¥È¤Î½ª¤ê¤Ë‘w’¤È‘q’¥³¥Þ
¥ó¥É¤òÀ¸À®¤·¤Þ¤¹¡¥¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¤-AeExX3¥ª¥×¥·¥ç¥ó¤Î°ì¤Ä¤ÈÁÈ
¤ß¹ç¤ï¤»¤ëɬÍפ¬¤¢¤ê¡¤-m¤ÈÁȤ߹ç¤ï¤»¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡¥
See Saving the Changed File.
-A¡¤-E¡¤¤½¤·¤Æ-X¥ª¥×¥·¥ç¥ó¤Ç½ÐÎϤµ¤ì¤ë¥«¥Ã¥³ ¤ËÂФ·¤Æ¡¤¥é¥Ù¥ëlabel¤ò»ÈÍѤ·¤Þ¤¹¡¥¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¤½¤ì¤¾¤ì¤ÎÆþÎÏ ¥Õ¥¡¥¤¥ë¤ËÂФ·¤Æ°ì¤Ä¡¤»°²ó¤Þ¤ÇÍ¿¤¨¤Æ¤â¤«¤Þ¤¤¤Þ¤»¤ó¡¥¥Ç¥Õ¥©¥ë¥È¤Î¥é¥Ù¥ë¤Ï ÆþÎÏ¥Õ¥¡¥¤¥ë¤Î̾Á°¤Ç¤¹¡¥¤³¤Î¤¿¤á¡¤‘diff3 -L X -L Y -L Z -m A B C’¤Ï ‘diff3 -m A B C’¤è¤¦¤Ëưºî¤·¤Þ¤¹¤¬¡¤½ÐÎϤϡ¤¥Õ¥¡¥¤¥ë̾‘A’¡¤ ‘B’¡¤¤½¤·¤Æ‘C’¤«¤é¤Ç¤Ï¤Ê¤¯¡¤¥Õ¥¡¥¤¥ë̾‘X’¡¤‘Y’¡¤¤½¤· ¤Æ‘Z’¤«¤é¤Î¤è¤¦¤Ë¸«¤¨¤Þ¤¹¡¥See Marking Conflicts.
ºÇ½é¤Î¥Õ¥¡¥¤¥ë¤ËÊÔ½¸¥¹¥¯¥ê¥×¥È¤òŬÍѤ·¡¤·ë²Ì¤òɸ½à½ÐÎϤËÁ÷¤ê¤Þ¤¹¡¥
diff3
¤Î½ÐÎϤòed
¤Ë¥Ñ¥¤¥×¤ÇÁ÷¤ë¤Î¤È¤Ï°Û¤Ê¤ê¡¤¤³¤ì¤Ï¥Ð
¥¤¥Ê¥ê¥Õ¥¡¥¤¥ë¤äÉÔ´°Á´¤Ê¥Õ¥¡¥¤¥ë¤ËÂФ·¤Æ¤âưºî¤·¤Þ¤¹¡¥ÊÔ½¸¥¹¥¯¥ê¥×¥È¤Î¥ª
¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¤-A¤¬²¾Äꤵ¤ì¤Þ¤¹¡¥
See Bypassing ed.
Ä̾ï¤Î½ñ¼°¤Î¹Ô¤ÎÁ°¤Î¥Æ¥¥¹¥È¤Ë¡¤Æó¤Ä¤Î¥¹¥Ú¡¼¥¹¤ÎÂå¤ï¤ê¤Ë¥¿¥Ö¤ò½ÐÎϤ·¤Þ¤¹¡¥ ¤³¤ì¤Ç¡¤¹ÔÃæ¤Î¥¿¥Ö¤Ë¤è¤ë°ÌÃÖ¹ç¤ï¤»¤¬ÉáÄ̤ˤʤê¤Þ¤¹¡¥See Tabs.
¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤ò½ÐÎϤ·½ªÎ»¤·¤Þ¤¹¡¥
-e¤Ë»÷¤Æ¤¤¤Þ¤¹¤¬¡¤¥ª¡¼¥Ð¡¼¥é¥Ã¥×¤·¤Æ¤¤¤ëÊѹ¹¤À¤±½ÐÎϤ·¤Þ¤¹¡¥ See Which Changes.
-E¤Ë»÷¤Æ¤¤¤Þ¤¹¤¬¡¤¥ª¡¼¥Ð¡¼¥é¥Ã¥×¤·¤Æ¤¤¤ëÊѹ¹¤À¤±½ÐÎϤ·¤Þ¤¹¡¥¸À ¤¤Âؤ¨¤ë¤È¡¤-x¤Ë»÷¤Æ¤¤¤Þ¤¹¤¬¡¤-E¤Î¤è¤¦¤Ë¥«¥Ã¥³¤òÊѹ¹¤· ¤Þ¤¹¡¥See Marking Conflicts.
-e¤Ë»÷¤Æ¤¤¤Þ¤¹¤¬¡¤¥ª¡¼¥Ð¡¼¥é¥Ã¥×¤·¤Æ¤¤¤Ê¤¤Êѹ¹¤À¤±½ÐÎϤ·¤Þ¤¹¡¥ See Which Changes.