Next: Bypassing ed, Previous: Which Changes, Up: diff3 Merging [Contents][Index]
diff3
¤Ç¡¤¾×ÆÍÉôʬ¤ËÆÃ¼ì¤Ê¥Þ¡¼¥«¡¼¹Ô¤òÍѤ¤¤Æ¥Þ¡¼¥¸¤µ¤ì¤¿½ÐÎϤò
°Ï¤à¤³¤È¤Ç¡¤°õ¤òÉÕ¤±¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡¥Æó¤Ä¤Î¥Õ¥¡¥¤¥ëA¤ÈB¤«¤é
¤Î¾×ÆÍ¤Ï¡¤°Ê²¼¤Î¤è¤¦¤Ë°õ¤¬ÉÕ¤¤Þ¤¹¡¥
<<<<<<< A lines from A ======= lines from B >>>>>>> B
»°¤Ä¤Î¥Õ¥¡¥¤¥ëA¡¤B¤½¤·¤ÆC¤«¤é¤Î¾×ÆÍ¤Ï¡¤°Ê²¼¤Î¤è¤¦¤Ë°õ ¤¬ÉÕ¤¤Þ¤¹¡¥
<<<<<<< A lines from A ||||||| B lines from B ======= lines from C >>>>>>> C
-A¤ä--show-all¥ª¥×¥·¥ç¥ó¤Ï¡¤-e¥ª¥×¥·¥ç¥ó¤Î¤è ¤¦¤Êưºî¤ò¤·¤Þ¤¹¤¬¡¤¾×ÆÍÉôʬ¤òÂ祫¥Ã¥³¤Ç°Ï¤ß¡¤¥Þ¡¼¥¸¤µ¤ì¤Æ¤¤¤Ê¤¤Êѹ¹¤À¤± ¤Ç¤Ê¤¯¡¤older¤«¤éyours¤Ø¤Î¤¹¤Ù¤Æ¤ÎÊѹ¹¤ò½ÐÎϤ·¤Þ¤¹¡¥¤³¤Î¤¿¤á¡¤ ¥µ¥ó¥×¥ë¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë(see Sample diff3 Input)¤¬Í¿¤¨¤é¤ì¤ë¤È¡¤ ‘diff3 -A lao tzu tao’¤Ï¡¤tzu¤Îº¹°ÛÉôʬ¤Î¾×ÆÍ¤Î¼þ¤ê¤ËÂ祫¥Ã ¥³¤ò½ñ¤¤Þ¤¹¡¥
<<<<<<< tzu ======= The Way that can be told of is not the eternal Way; The name that can be named is not the eternal name. >>>>>>> tao
¤Þ¤¿¡¤»°Êý¸þ¤Î¾×ÆÍ¤Ï°Ê²¼¤Î¤è¤¦¤Ë½ÐÎϤµ¤ì¤Þ¤¹¡¥
<<<<<<< lao ||||||| tzu They both may be called deep and profound. Deeper and more profound, The door of all subtleties! ======= -- The Way of Lao-Tzu, tr. Wing-tsit Chan >>>>>>> tao
-E¤ä--show-overlap¥ª¥×¥·¥ç¥ó¤Ï¡¤-A¤ä --show-all¥ª¥×¥·¥ç¥ó¤è¤ê¾ðÊ󤬾¯¤Ê¤¯¤Ê¤ê¡¤¤½¤ì¤Ï¥Þ¡¼¥¸¤µ¤ì¤Æ¤¤ ¤Ê¤¤Êѹ¹¤À¤±¤ò½ÐÎϤ·¡¤ÆóÈÖÌܤΥե¡¥¤¥ë¤ÎÆâÍÆ¤ò½ÐÎϤ·¤Ê¤¤¤¿¤á¤Ç¤¹¡¥¤½¤Î¤¿ ¤á¡¤-E¥ª¥×¥·¥ç¥ó¤Ï-e¥ª¥×¥·¥ç¥ó¤Î¤è¤¦¤Ëưºî¤·¤Þ¤¹¤¬¡¤»° Êý¸þ¤Î¥ª¡¼¥Ð¡¼¥é¥Ã¥×¤·¤¿Êѹ¹¤Ç¡¤ºÇ½é¤È»°ÈÖÌܤΥե¡¥¤¥ë¤¬Â祫¥Ã¥³¤Ç°Ï¤ß¤Þ ¤¹¡¥Æ±Íͤˡ¤-X¤Ï-x¤Î¤è¤¦¤Ëưºî¤·¤Þ¤¹¤¬¡¤(¥ª¡¼¥Ð¡¼¥é¥Ã ¥×¤¬É¬ÍפÊ)Êѹ¹¤Î¤¹¤Ù¤Æ¤òÂ祫¥Ã¥³¤Ç°Ï¤ß¤Þ¤¹¡¥Î㤨¤Ð¡¤¾åµ¤Î¤è¤¦¤Ê»°Êý¸þ ¤Î¥ª¡¼¥Ð¡¼¥é¥Ã¥×¤·¤Æ¤¤¤ëÊѹ¹¤ËÂФ·¡¤-E¤È-X¥ª¥×¥·¥ç¥ó¤Ï °Ê²¼¤ò½ÐÎϤ·¤Þ¤¹¡¥
<<<<<<< lao ======= -- The Way of Lao-Tzu, tr. Wing-tsit Chan >>>>>>> tao
̵°ÕÌ£¤Ç¾ðÊó¤Î¤Ê¤¤Ì¾Á°¤ò»ý¤Ä¥Õ¥¡¥¤¥ë¤òÈæ³Ó¤·¤Æ¤¤¤ë¾ì¹ç¡¤‘<<<<<<<’¡¤ ‘|||||||’¡¤¤½¤·¤Æ‘>>>>>>>’¤ÎÂ祫¥Ã¥³¤ÇÊÌ̾¤òɽ¼¨¤¹¤ë¤¿¤á¤Ë¡¤ -L label¤ä--label=label¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹ ¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡¥¤³¤Î¥ª¥×¥·¥ç¥ó¤Ç¡¤¤½¤ì¤¾¤ì¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤´¤È¤Ë¡¤»°²ó¤Þ ¤ÇÍ¿¤¨¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡¥¤³¤Î¤¿¤á¡¤‘diff3 -A -L X -L Y -L Z A B C’¤Ï ‘diff3 -A A B C’¤Î¤è¤¦¤Ëưºî¤·¤Þ¤¹¤¬¡¤½ÐÎϤϡ¤¥Õ¥¡¥¤¥ë̾‘A’¡¤ ‘B’¡¤¤½¤·¤Æ‘C’¤Ç¤Ï¤Ê¤¯¡¤¥Õ¥¡¥¤¥ë̾‘X’¡¤‘Y’¡¤¤½¤·¤Æ ‘Z’¤«¤é¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡¥