DIFF3

̾Á°

½ñ¼°

diff3 [-v] [--help] [--version]  

ÀâÌÀ

Èæ³ÓÂоݤȤʤë¥Õ¥¡¥¤¥ë¤Ï MINE, OLDER, YOURS ¤Ç¤¢¤ë¡£¤³¤ì¤é»°¤Ä¤Î¥Õ¥¡¥¤¥ë¤Î¤¦¤Á¤Î°ì¤Ä¤ò `-' ¤È¤·¤Æ¤â¤è¤¯¡¢¤½¤Î¾ì¹ç¤½¤Î¥Õ¥¡¥¤¥ë¤Ïɸ½àÆþÎϤ«¤éÆɤ߹þ¤Þ¤ì¤ë¡£

Ä̾ï diff3 ¤Ï¼«Ê¬¤Îºî¶È¤Î¤¿¤á¤Ë diff ¤òµ¯Æ°¤¹¤ë¡£¤·¤«¤· BDIFF ´Ä¶­ÊÑ¿ô¤Ë¾¤Î¥×¥í¥°¥é¥à¤òÀßÄꤹ¤ì¤Ð¡¢ ¤½¤Î¥×¥í¥°¥é¥à¤ò»È¤¦¤è¤¦¤ËÊѹ¹¤Ç¤­¤ë¡£  

¥ª¥×¥·¥ç¥ó

-3, --easy-only

-e ¤È»÷¤Æ¤¤¤ë¤¬¡¢½ÅÊ£¤·¤Æ¤¤¤Ê¤¤Êѹ¹Éôʬ¤À¤±¤ò½ÐÎϤ¹¤ë¡£

-a, --text

¥Õ¥¡¥¤¥ë¤¬¥Æ¥­¥¹¥È¤Ë¤Ï¸«¤¨¤Ê¤¤¤è¤¦¤Ê¾ì¹ç¤Ç¤â¡¢ Á´¤Æ¤Î¥Õ¥¡¥¤¥ë¤ò¥Æ¥­¥¹¥È¤È¤ß¤Ê¤·¤Æ 1 ¹Ô¤º¤ÄÈæ³Ó¤ò¹Ô¤¦¡£

-e, --ed

OLDER ¤«¤é YOURS ¤Ø¤Î¤¹¤Ù¤Æ¤ÎÊѹ¹¤ò MINE ¤Ë¥Þ¡¼¥¸¤¹¤ë¤è¤¦¤Ê ed ¥¹¥¯¥ê¥×¥È¤òÀ¸À®¤¹¤ë¡£

-i

System V ¸ß´¹À­¤Î¤¿¤á¤Ë¡¢ ed ¥¹¥¯¥ê¥×¥È¤ÎËöÈø¤Ë `w' ¥³¥Þ¥ó¥É¤È `q' ¥³¥Þ¥ó¥É¤òÀ¸À®¤¹¤ë¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï -AeExX3 ¤Î¤¤¤º¤ì¤«¤Î¥ª¥×¥·¥ç¥ó¤È¶¦¤ËÍѤ¤¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡£¤Þ¤¿ -m ¤ÈƱ»þ¤Ë»ØÄꤹ¤ë¤³¤È¤Ï¤Ç¤­¤Ê¤¤¡£

-m, --merge

ed ¥¹¥¯¥ê¥×¥È¤ò 1 ÈÖÌܤΥե¡¥¤¥ë¤ËŬÍѤ·¡¢¤½¤Î·ë²Ì¤òɸ½à½ÐÎϤËÁ÷¤ë¡£ diff3 ¤Î½ÐÎϤò ed ¤ËÁ÷¤ë¤Î¤È°Û¤Ê¤ê¡¢ ¤³¤Î¥ª¥×¥·¥ç¥ó¤ÎÆ°ºî¤Ï¥Ð¥¤¥Ê¥ê¥Õ¥¡¥¤¥ë¤ä²þ¹Ô¤µ¤ì¤Æ¤¤¤Ê¤¤¹Ô¤Ë¤âŬÍѤǤ­¤ë¡£ ed ¥¹¥¯¥ê¥×¥È¤Î¥ª¥×¥·¥ç¥ó¤¬²¿¤â»ØÄꤵ¤ì¤Ê¤±¤ì¤Ð¡¢ -A ¤ò°ÅÌۤΤ¦¤Á¤Ë»ØÄꤹ¤ë¡£

-x, --overlap-only

-e ¤È»÷¤Æ¤¤¤ë¤¬¡¢½ÅÊ£¤·¤Æ¤¤¤ëÊѹ¹¤À¤±¤ò½ÐÎϤ¹¤ëÅÀ¤¬°Û¤Ê¤ë¡£

-A, --show-all

OLDER ¤«¤é YOURS ¤Ø¤ÎÁ´¤Æ¤ÎÊѹ¹¤ò MINE ¤Ë¥Þ¡¼¥¸¤¹¤ë¡£½ÅÊ£¤·¤Æ¤¤¤ëÊѹ¹¤Ï¥Ö¥é¥±¥Ã¥È¹Ô¤Ç°Ï¤Ã¤Æ½ÐÎϤ¹¤ë¡£

-E, --show-overlap

-e ¤È»÷¤Æ¤¤¤ë¤¬¡¢½ÅÊ£Éôʬ¤Î¥Ö¥é¥±¥Ã¥È¹Ô¤ÎÂè 1¡¦Âè 3 ¹Ô¤¬°Û¤Ê¤ë¡£ -E ¤Ç¤Ï½ÅÊ£¤·¤Æ¤¤¤ëÊѹ¹¤Ï°Ê²¼¤Î¤è¤¦¤Ë¤Ê¤ë¡£

<<<<<<< MINE
lines from MINE
=======
lines from YOURS
>>>>>>> YOURS

-L LABEL, --label=LABEL

-A, -E, -X ¥ª¥×¥·¥ç¥ó¤Î¥Ö¥é¥±¥Ã¥È¹Ô¤Ë¡¢¥é¥Ù¥ë LABEL ¤òÍѤ¤¤ë¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¤½¤ì¤¾¤ì¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤ËÂбþ¤·¤Æ 3 ¤Ä¤Þ¤ÇÍ¿¤¨¤ë¤³¤È¤¬¤Ç¤­¤ë¡£ ¥Ç¥Õ¥©¥ë¥È¤Î¥é¥Ù¥ë¤ÏÆþÎÏ¥Õ¥¡¥¤¥ë¤Î¥Õ¥¡¥¤¥ë̾¤Ç¤¢¤ë¡£¤·¤¿¤¬¤Ã¤Æ diff3 -L X -L Y -L Z -m A B C ¤Ï diff3 -m A B C ¤ÈƱ¤¸¤è¤¦¤ËÆ°ºî¤¹¤ë¤¬¡¢ ÆþÎϤ¬ A, B, C ¤Ç¤Ï¤Ê¤¯ X, Y, Z ¤Î¤â¤Î¤Ç¤¢¤ë¤«¤Î¤è¤¦¤Ê½ÐÎϤȤʤ롣

-T, --initial-tab

-X

-E ¤È»÷¤Æ¤¤¤ë¤¬¡¢½ÅÊ£¤·¤Æ¤¤¤ëÊѹ¹¤À¤±¤ò½ÐÎϤ¹¤ëÅÀ¤¬°Û¤Ê¤ë¡£ Ê̤θÀ¤¤Êý¤ò¤¹¤ì¤Ð¡¢ -x ¤È»÷¤Æ¤¤¤ë¤¬¡¢ -E ¤Î¤è¤¦¤ËÊѹ¹¤ò¥Ö¥é¥±¥Ã¥È¹Ô¤Ç°Ï¤¦ÅÀ¤¬°Û¤Ê¤ë¡£

--help

ɸ½à½ÐÎϤ˻ÈÍÑÊýË¡¤Î¥á¥Ã¥»¡¼¥¸¤ò½ÐÎϤ·¤ÆÀµ¾ï½ªÎ»¤¹¤ë¡£

-v, --version

diff3 ¤Î¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤ò½ÐÎϤ¹¤ë¡£

½ÐÎÏ·Á¼°

¥³¥Þ¥ó¥É·Á¼°

FILE:La

¤³¤Î hunk ¤Ï FILE ¤Î L ¹Ô°Ê¹ß¤Ë¸½¤ì¤ë¤Ù¤­¤â¤Î¤Ç¡¢¤½¤Î¥Õ¥¡¥¤¥ë¤Ë¤Ï¸ºß¤·¤Æ¤¤¤Ê¤¤¡£ ¤³¤Î¥Õ¥¡¥¤¥ë¤ò½¤Àµ¤·¤Æ¾¤Î¥Õ¥¡¥¤¥ë¤ÈƱ¤¸¤Ë¤¹¤ë¤Ë¤Ï¡¢ ¾¤Î¹Ô¤«¤é¤Î hunk ¤Î¹Ô¤òÄɲ䷤ʤ±¤ì¤Ð¤Ê¤é¤Ê¤¤¡£Î㤨¤Ð `1:11a' ¤Ï¡¢¤½¤Î hunk ¤Ï¥Õ¥¡¥¤¥ë 1 ¤Î 11 ¹ÔÌܰʹߤËÄɲ乤٤­¤â¤Î¤Ç¡¢ ¥Õ¥¡¥¤¥ë 1 ¤Ë¤Ï´Þ¤Þ¤ì¤Æ¤¤¤Ê¤¤¤³¤È¼¨¤¹¡£

FILE:Rc

¤³¤Î hunk ¤Ë¤Ï¡¢ FILE ¤Î¹ÔÈÏ°Ï R ¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¡£¹ÔÈÏ°Ï R ¤Ï 2 ¤Ä¤Î¹ÔÈÖ¹æ¤ò¥³¥ó¥Þ¤Ç¶èÀڤ俤â¤Î¤Ç¤¢¤ë¡£ ¿ô»ú¤¬°ì¤Ä¤À¤Ã¤¿¤é 1 ¹Ô¤À¤±¤ÎÈϰϤȲò¼á¤µ¤ì¤ë¡£ ¤³¤Î¥Õ¥¡¥¤¥ë¤òÊÔ½¸¤·¤Æ¾¤Î¥Õ¥¡¥¤¥ë¤ÈƱ¤¸¤Ë¤¹¤ë¤Ë¤Ï¡¢ ¤½¤Î¹ÔÈϰϤò¡¢Â¾¤Î¥Õ¥¡¥¤¥ë¤«¤é¤È¤Ã¤Æ¤­¤ÆÊѹ¹¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡£ Î㤨¤Ð `2:11,13c' ¤Ï¡¢¤³¤Î hunk ¤Ï 2 ÈÖÌܤΥե¡¥¤¥ë¤Î 11¡Á13 ¹ÔÌܤ«¤é¤È¤Ã¤Æ¤­¤¿¤â¤Î¤Ç¤¢¤ë¤³¤È¤ò¼¨¤¹¡£

ÆþÎϹԥ»¥Ã¥È¤ÎºÇ¸å¤Î¹Ô¤¬²þ¹Ô¤Ç½ª¤ï¤Ã¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢ ½ÐÎϤμ¡¤Î¹Ô¤¬ `\' ¤Ç»Ï¤Þ¤ë¤Î¤Ç¡¢²þ¹Ô¤Ç½ª¤ï¤Ã¤Æ¤¤¤ë¾ì¹ç¤È¶èÊ̤Ǥ­¤ë¡£

ÊÖ¤êÃÍ

0

diff3 ¤ÏÀ®¸ù¤·¡¢½ÅÊ£¤·¤Æ¤¤¤ëÊѹ¹ (¾×ÆÍ) ¤Ï¸ºß¤·¤Ê¤«¤Ã¤¿¡£

1

½ÅÊ£¤¬¸«ÉÕ¤«¤Ã¤¿¡£

2

²¿¤é¤«¤Î¥¨¥é¡¼¤¬µ¯¤³¤Ã¤¿¡£

´ØÏ¢¹àÌÜ

Ãí°Õ

Index

̾Á°

½ñ¼°

ÀâÌÀ

¥ª¥×¥·¥ç¥ó

½ÐÎÏ·Á¼°

¥³¥Þ¥ó¥É·Á¼°

ÊÖ¤êÃÍ

´ØÏ¢¹àÌÜ

Ãí°Õ