Next: diff3 Hunks, Previous: Sample diff3 Input, Up: Comparing Three Files [Contents][Index]
diff3
¤ÎÄ̾ï¤Î½ñ¼°¤Î¾ÜºÙ¤ÊÀâÌÀ¤½¤ì¤¾¤ì¤Îhunk¤Ï‘====’¤Ç°õ¤¬¤Ä¤¤¤¿¹Ô¤Ç»Ï¤Þ¤ê¤Þ¤¹¡¥»°Êý¸þ¤Îhunk¤Ë¤Ï¡¤ ‘====’¹Ô¤¬¤¢¤ê¡¤ÆóÊý¸þ¤Îhunk¤Ë¤Ï¡¤¤½¤Îhunk¤Ëº¹°Û¤Î¤¢¤ë»°¤Ä¤ÎÆþÎÏ¥Õ¥¡ ¥¤¥ë¤Î¤¤¤º¤ì¤«¤ò¼¨¤¹¡¤‘1’¡¤‘2’¡¤¤Þ¤¿¤Ï‘3’¤¬¸åÃÖ¤µ¤ì¤Þ¤¹¡¥ hunk¤Ë¤Ï¡¤ÆþÎϹԤ¬¤É¤³¤«¤é¤Î¤â¤Î¤«¤ò¼¨¤¹°ì¤Ä¤Þ¤¿¤ÏÆó¤Ä¤Î¥³¥Þ¥ó¥É¤¬Á°ÃÖ¤µ ¤ì¤Æ¤¤¤ë¡¤ÆþÎÏ¹Ô¤ÎÆó¤Ä¤Þ¤¿¤Ï»°¤Ä¤ÎÁȤΥ³¥Ô¡¼¤¬´Þ¤Þ¤ì¤Þ¤¹¡¥
Ä̾¥³¥Þ¥ó¥É¤´¤È¤Ë°Û¤Ê¤ëÆþÎϹæ¤Î¥³¥Ô¡¼¤ËÆó¤Ä¤Î¥¹¥Ú¡¼¥¹¤¬Á°ÃÖ¤µ¤ì¤Þ¤¹¡¥
¤·¤«¤·¡¤-T¤ä--initial-tab¥ª¥×¥·¥ç¥ó¤òÍѤ¤¤ë¤È¡¤
diff3
¤ÏÆó¤Ä¤Î¥¹¥Ú¡¼¥¹¤ÎÂå¤ï¤ê¤Ë¥¿¥Ö¤ò»ÈÍѤ·¤Þ¤¹¡¥¤³¤ì¤Ç¥¿¥Ö¤Î
¹Ô·¤¨¤ÏÀµ¤·¤¯¤Ê¤ê¤Þ¤¹¡¥¾ÜºÙ¤Ï¡¤See Tabs.
¥³¥Þ¥ó¥É¤Ï°Ê²¼¤Î·Á¼°¤È¤Ê¤ê¤Þ¤¹¡¥
¤³¤Îhunk¤Ï¡¤¥Õ¥¡¥¤¥ëfile¤Î¹Ôl°Ê¹ß¤Ë¤¢¤ê¡¤¤½¤Î¥Õ¥¡¥¤¥ë¤Ë´Þ¤Þ ¤ì¤Æ¤¤¤Ê¤¤¹Ô¤Ç¤¹¡¥¤â¤¦°ìÊý¤Î¥Õ¥¡¥¤¥ë¤òÀ¸À®¤¹¤ë¤Ù¤¯¤³¤Î¥Õ¥¡¥¤¥ë¤òÊÔ½¸¤¹¤ë ¤¿¤á¡¤¤â¤¦°ìÊý¤Î¥Õ¥¡¥¤¥ë¤«¤éÆÀ¤é¤ì¤ëhunk¹Ô¤ò¸åÃÖ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡¥Î㤨 ¤Ð¡¤‘1:11a’¤ÏºÇ½é¤Î¥Õ¥¡¥¤¥ë¤Î11¹Ô°Ê¹ß¤Îhunk¤Ç¡¤¤½¤Î¥Õ¥¡¥¤¥ë¤Ë¤½¤Î¹Ô ¤¬´Þ¤Þ¤ì¤Æ¤¤¤Ê¤¤¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡¥
¤³¤Îhunk¤Ï¡¤¥Õ¥¡¥¤¥ëfile¤ÎÈϰÏr¤Î¹Ô¤ò´Þ¤ß¤Þ¤¹¡¥ÈϰÏr¤Ï ¥«¥ó¥Þ¤ÇʬΥ¤µ¤ì¤Æ¤¤¤ë¹ÔÈÖ¹æ¤ÎÁÈ¡¤¤Þ¤¿¤ÏÈϰϤ¬Ã±°ì¹Ô¤Î¾ì¹ç¡¤°ì¤Ä¤Î¿ô»ú¤À ¤±¤Ë¤Ê¤ê¤Þ¤¹¡¥¤â¤¦°ìÊý¤Î¥Õ¥¡¥¤¥ë¤òÀ¸À®¤¹¤ë¤Ù¤¯¤³¤Î¥Õ¥¡¥¤¥ë¤òÊÔ½¸¤¹¤ë¤¿¤á¡¤ »ØÄꤵ¤ì¤¿¹Ô¤ò¡¤¤â¤¦°ìÊý¤Î¥Õ¥¡¥¤¥ë¤«¤éÆÀ¤é¤ì¤ë¹Ô¤ËÊѹ¹¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡¥ Î㤨¤Ð¡¤‘2:11,13c’¤Ï¡¤hunk¤¬ÆóÈÖÌܤΥե¡¥¤¥ë¤Î11¹Ô¤«¤é13¹Ô¤Ë´Þ¤Þ¤ì ¤Æ¤¤¤ë¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡¥
ÆþÎϹԤÎÁȤκǸå¤Î¹Ô¤¬ÉÔ´°Á´¤Ê¾ì¹ç(see Incomplete Lines)¡¤½ÐÎϤȤ϶è Ê̤µ¤ì¤ë‘\’¤Ç»Ï¤Þ¤ë¹Ô¤¬¸åÃÖ¤µ¤ì¤¿´°Á´¤Ê¹Ô¤Ë¤Ê¤ê¤Þ¤¹¡¥