Use the program
See section Invoking
Here is a third sample file that will be used in examples to
illustrate the output of
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
Each hunk begins with a line marked ====. Three-way hunks have plain ==== lines, and two-way hunks have 1, 2, or 3 appended to specify which of the three input files differ in that hunk. The hunks contain copies of two or three sets of input lines each preceded by one or two commands identifying where the lines came from.
Normally, two spaces precede each copy of an input line to
distinguish it from the commands. But with the -T or --initial-tab
Commands take the following forms:
If the last line in a set of input lines is incomplete (see section Incomplete Lines), it is distinguished on output from a full line by a following line that starts with \.
Groups of lines that differ in two or three of the input files
are called diff3 hunks, by analogy with
For example, suppose F contains the three lines a, b, f, G contains the lines g, b, g, and H contains the lines a, b, h. diff3 F G H might output the following:
====2 1:1c 3:1c a 2:1c g ==== 1:3c f 2:3c g 3:3c h
because it found a two-way hunk containing a in the first and third files and g in the second file, then the single line b common to all three files, then a three-way hunk containing the last line of each file.
Here is the output of the command diff3 lao tzu tao (see section A Third Sample Input File, for the complete contents of the files). Notice that it shows only the lines that are different among the three files.
====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
To return to the Ready-to-Run Software Super ReadyPak Table of Contents please press here.
Email addresses listed on this site may NOT be used for unsolicited commercial email.
Portions (c)Copyright, 1996-2005 by