Previous: diff3 Hunks, Up: Comparing Three Files


7.4 diff3の通常の書式の例

コマンド‘diff3 lao tzu tao’の出力は以下のようになります(ファイルの 完全な内容はsee Sample diff3 Input).三つのファイル間で差異のある行 だけが表示されていることに注意してください.

     ====2
     1:1,2c
     3:1,2c
       The Way that can be told of is not the eternal Way;
       The name that can be named is not the eternal name.
     2:0a
     ====1
     1:4c
       The Named is the mother of all things.
     2:2,3c
     3:4,5c
       The named is the mother of all things.
     
     ====3
     1:8c
     2:7c
         so we may see their outcome.
     3:9c
         so we may see their result.
     ====
     1:11a
     2:11,13c
       They both may be called deep and profound.
       Deeper and more profound,
       The door of all subtleties!
     3:13,14c
     
         -- The Way of Lao-Tzu, tr. Wing-tsit Chan