Next: , Previous: Detailed Context, Up: Context Format


2.3.1.2 周りの文を使用した書式の例

コマンド‘diff -c lao tzu’の出力は以下のようになります(完全な二つの ファイルの内容はsee Sample diff Input).差の無い行が三行になるまで, 差がある行の周りの行が表示されていることに注目してください.それらは周り の文の行です.周りの文が重なっているため,最初の二つのhunkは一緒になって いることにも注目してください.

     *** lao	2002-02-21 23:30:39.942229878 -0800
     --- tzu	2002-02-21 23:30:50.442260588 -0800
     ***************
     *** 1,7 ****
     - 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,
     --- 1,6 ----
       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,
     ***************
     *** 9,11 ****
     --- 8,13 ----
       The two are the same,
       But after they are produced,
         they have different names.
     + They both may be called deep and profound.
     + Deeper and more profound,
     + The door of all subtleties!