Next: Detailed diff3 Normal, Up: Comparing Three Files [Contents][Index]
diff3
¤Î½ÐÎϤȥª¥×¥·¥ç¥ó¤Ç¤½¤ì¤òÊѹ¹¤¹¤ëÍͻҤò¼¨¤¹Îã¤Ç»ÈÍѤ¹¤ë
»°ÈÖÌܤΥµ¥ó¥×¥ë¥Õ¥¡¥¤¥ë¤Ï¡¤°Ê²¼¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡¥ºÇ½é¤ÎÆó¤Ä¤Î¥Õ¥¡¥¤¥ë¤Ï¡¤
diff
¤Ç»ÈÍѤ·¤¿¤â¤Î¤ÈƱ¤¸¤Ç¤¹(see Sample diff Input)¡¥°Ê²¼
¤Ï¡¤tao¤È¤¤¤¦»°ÈÖÌܤΥµ¥ó¥×¥ë¥Õ¥¡¥¤¥ë¤Ç¤¹¡¥
The Way that can be told of is not the eternal Way; The name that can be named is not the eternal name. The Nameless is the origin of Heaven and Earth; The named is the mother of all things. Therefore let there always be non-being, so we may see their subtlety, And let there always be being, so we may see their result. The two are the same, But after they are produced, they have different names. -- The Way of Lao-Tzu, tr. Wing-tsit Chan