Next: , Previous: Marking Conflicts, Up: diff3 Merging   [Contents][Index]


8.3 ¥Þ¡¼¥¸¤µ¤ì¤¿½ÐÎϤòľÀÜÀ¸À®¤¹¤ë

-m¤ä--merge¥ª¥×¥·¥ç¥ó¤òÍѤ¤¤ë¤È¡¤diff3¤Ï¥Þ¡¼ ¥¸¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤òľÀܽÐÎϤ·¤Þ¤¹¡¥¤³¤ì¤Ï¡¤¤½¤ì¤òÀ¸À®¤¹¤ë¤¿¤á¤Ë ed¤ò»ÈÍѤ¹¤ë¤è¤ê¸ú²ÌŪ¤Ç¡¤ed¤¬½ü³°¤¹¤ë¥Æ¥­¥¹¥È¤Ç¤Ï¤Ê ¤¤¥Õ¥¡¥¤¥ë¤Ç¤âưºî¤·¤Þ¤¹¡¥ed¥¹¥¯¥ê¥×¥È¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ»¤º¤Ë -m¤ò»ØÄꤹ¤ë¾ì¹ç¡¤-A (--show-all)¤¬²¾Äꤵ¤ì¤Þ ¤¹¡¥

Î㤨¤Ð¡¤¥³¥Þ¥ó¥É‘diff3 -m lao tzu tao’¤Ï(ÆþÎÏ¥Õ¥¡¥¤¥ë¤Î¥³¥Ô¡¼¤Ï see Sample diff3 Input)¡¤°Ê²¼¤Î½ÐÎϤòÀ¸À®¤·¤Þ¤¹¡¥

<<<<<<< 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
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.
<<<<<<< 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