Next: Example diff3 Normal, Previous: Detailed diff3 Normal, Up: Comparing Three Files [Contents][Index]
diff3
¤ÎhunkÆó¤Ä¤Þ¤¿¤Ï»°¤Ä¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤Îº¹Ê¬¤Î¹Ô¤Î¥°¥ë¡¼¥×¤Ï¡¤diff3 hunks¤È
¸Æ¤Ð¤ì¡¤diff
¤Îhunk¤Ë»÷¤Æ¤¤¤Þ¤¹(see Hunks)¡¥diff3
¤Îhunk¤Ç»°¤Ä¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤¬¤¹¤Ù¤Æ°Û¤Ê¤ë¾ì¹ç¡¤hunk¤Ï»°Êý¸þ¤Î
hunk(three-way hunk)¤È¸Æ¤Ð¤ì¤Þ¤¹¡¥Æó¤Ä¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤À¤±¤¬°Û¤Ê¤ë¾ì¹ç¡¤
¤½¤ì¤ÏÆóÊý¸þ¤Îhunk(two-way hunk)¡¥
diff
¤ÈƱÍͤˡ¤¤¤¤¯¤Ä¤«¤Î²ò¤¬¹Í¤¨¤é¤ì¤Þ¤¹¡¥¥Õ¥¡¥¤¥ë‘A’¡¤
‘B’¡¤¤½¤·¤Æ‘C’¤òÈæ³Ó¤¹¤ë¤È¤¡¤ diff3
¤ÏÄ̾Æó¤Ä¤Î¥³
¥Þ¥ó¥É‘diff A B’¤È‘diff A C’¤Ç½ÐÎϤµ¤ì¤ëÆóÊý¸þ¤Îhunk¤ò¥Þ¡¼¥¸¤·
¤Æ¡¤diff3
¤Îhunk¤ò¸«¤Ä¤±¤Þ¤¹¡¥¤³¤ì¤Ç¤Ï¡¤É¬¤º¤·¤â½ÐÎϤ¬ºÇ¾®¤Ë¤Ê
¤ë¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¤¬¡¤Îã³°¤ÏÌÇ¿¤Ë¤Ê¤¤¤Ç¤·¤ç¤¦¡¥
Î㤨¤Ð¡¤F¤Ë¤Ï»°¹Ô‘a’¡¤‘b’¡¤‘f’¤¬´Þ¤Þ¤ì¤Æ¤¤¤Æ¡¤ G¤Ë‘g’¡¤‘b’¡¤‘g’¤È¤¤¤¦¹Ô¤¬´Þ¤Þ¤ì¤Æ¤¤¤Æ¡¤¤½¤·¤Æ H¤Ë‘a’¡¤‘b’¡¤‘h’¤È¤¤¤¦¹Ô¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¤È²¾Äꤷ¤Þ¤¹¡¥ ‘diff3 F G H’¤Î½ÐÎϤϰʲ¼¤Î¤è¤¦¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡¥
====2 1:1c 3:1c a 2:1c g ==== 1:3c f 2:3c g 3:3c h
¤½¤ÎÍýͳ¤Ï¡¤ºÇ½é¤Î¥Õ¥¡¥¤¥ë¤È»°ÈÖÌܤΥե¡¥¤¥ë¤Î‘a’¤¬´Þ¤Þ¤ì¤ëÆóÊý¸þ¤Î hunk¤ÈÆóÈÖÌܤΥե¡¥¤¥ë¤Î‘g’¤ò¸«¤Ä¤±¡¤Ã±°ì¹Ô¤Î‘b’¤¬»°¤Ä¤Î¥Õ¥¡¥¤ ¥ë¤¹¤Ù¤Æ¤Î¶¦Ä̹ԤȤ·¤Æ¸«¤Ä¤«¤ê¡¤¤½¤ì¤¾¤ì¤Î¥Õ¥¡¥¤¥ë¤ÎºÇ¸å¤Î¹Ô¤Ë´Þ¤Þ¤ì¤ë»° Êý¸þ¤Îhunk¤¬¸«¤Ä¤«¤ë¤¿¤á¤Ç¤¹¡¥