Lines Matching refs:diff3
13 and documents the @acronym{GNU} @command{diff}, @command{diff3},
42 * diff3: (diff)Invoking diff3. Compare 3 files line by line.
83 * diff3 Merging:: Merging from a common ancestor.
92 * Invoking diff3:: Compare three files line by line.
127 You can use the @command{diff3} command to show differences among three
129 original, @command{diff3} can report the differences between the original
176 @acronym{GNU} @command{diff3} was written by Randy Smith. @acronym{GNU}
223 @command{diff3} normally compares three input files line by line, finds
486 If @command{diff3} thinks that any of the files it is comparing is binary
488 comparisons are usually not useful. @command{diff3} uses the same test as
491 text files, you can force @command{diff3} to consider all files to be text
1961 @cindex format of @command{diff3} output
1963 Use the program @command{diff3} to compare three files and show any
1964 differences among them. (@command{diff3} can also merge files; see
1965 @ref{diff3 Merging}).
1967 The ``normal'' @command{diff3} output format shows each hunk of
1972 @xref{Invoking diff3}, for more information on how to run @command{diff3}.
1975 * Sample diff3 Input:: Sample @command{diff3} input for examples.
1976 * Example diff3 Normal:: Sample output in the normal format.
1977 * diff3 Hunks:: The format of normal output format.
1978 * Detailed diff3 Normal:: A detailed description of normal output format.
1981 @node Sample diff3 Input
1983 @cindex @command{diff3} sample input
1984 @cindex sample input for @command{diff3}
1987 the output of @command{diff3} and how various options can change it. The
2008 @node Example diff3 Normal
2009 @section An Example of @command{diff3} Normal Format
2011 Here is the output of the command @samp{diff3 lao tzu tao}
2012 (@pxref{Sample diff3 Input}, for the complete contents of the files).
2047 @node Detailed diff3 Normal
2048 @section Detailed Description of @command{diff3} Normal Format
2059 option, @command{diff3} uses a tab instead of two spaces; this lines up
2085 @node diff3 Hunks
2086 @section @command{diff3} Hunks
2087 @cindex hunks for @command{diff3}
2088 @cindex @command{diff3} hunks
2091 called @dfn{diff3 hunks}, by analogy with @command{diff} hunks
2092 (@pxref{Hunks}). If all three input files differ in a @command{diff3}
2097 files @samp{A}, @samp{B}, and @samp{C}, @command{diff3} normally finds
2098 @command{diff3} hunks by merging the two-way hunks output by the two
2105 @samp{h}. @samp{diff3 F G H} might output the following:
2129 @node diff3 Merging
2134 @command{diff3} can produce a merged output that contains both sets of
2139 need rarely arises. You can use @command{diff3} to merge three or more
2142 @command{diff3} can incorporate changes from two modified versions into a
2149 diff3 @var{mine} @var{older} @var{yours}
2167 @command{diff3} gives you several ways to handle overlaps and conflicts.
2171 @command{diff3} can output the merge results as an @command{ed} script that
2173 However, it is usually better to have @command{diff3} generate the merged
2180 * Merging Incomplete Lines:: How @command{diff3} merges incomplete lines.
2203 Here is the output of the command @command{diff3} with each of these three
2204 options (@pxref{Sample diff3 Input}, for the complete contents of the files).
2208 Output of @samp{diff3 -e lao tzu tao}:
2219 Output of @samp{diff3 -3 lao tzu tao}:
2226 Output of @samp{diff3 -x lao tzu tao}:
2239 @command{diff3} can mark conflicts in the merged output by
2267 given the sample input files (@pxref{Sample diff3 Input}), @samp{diff3
2315 times, once for each input file. Thus @samp{diff3 -A --label X
2317 B C} acts like @samp{diff3 -A A B C}, except that the output looks like
2323 @cindex merged @command{diff3} format
2325 With the @option{-m} or @option{--merge} option, @command{diff3} outputs the
2331 For example, the command @samp{diff3 -m lao tzu tao}
2332 (@pxref{Sample diff3 Input} for a copy of the input files) would output
2362 @section How @command{diff3} Merges Incomplete Lines
2373 incomplete line is found, @command{diff3} generates a warning and acts as
2378 @cindex System V @command{diff3} compatibility
2380 Traditional Unix @command{diff3} generates an @command{ed} script without the
2382 System V @command{diff3} generates these extra commands. @acronym{GNU}
2383 @command{diff3} normally behaves like traditional Unix
2384 @command{diff3}, but with the @option{-i} option it behaves like
2385 System V @command{diff3} and appends the @samp{w} and @samp{q}
3934 @node Invoking diff3
3935 @chapter Invoking @command{diff3}
3936 @cindex invoking @command{diff3}
3937 @cindex @command{diff3} invocation
3939 The @command{diff3} command compares three files and outputs descriptions
3943 diff3 @var{options}@dots{} @var{mine} @var{older} @var{yours}
3948 which tells @command{diff3} to read the standard input for that file.
3950 An exit status of 0 means @command{diff3} was successful, 1 means some
3954 * diff3 Options:: Summary of options to @command{diff3}.
3957 @node diff3 Options
3958 @section Options to @command{diff3}
3959 @cindex @command{diff3} options
3960 @cindex options for @command{diff3}
3962 Below is a summary of all of the options that @acronym{GNU} @command{diff3}
4015 the input files. Thus @samp{diff3 --label X --label Y --label Z -m A
4017 @samp{diff3 -m A B C}, except that the output looks like it came from
4024 output. Unlike piping the output from @command{diff3} to @command{ed}, this
4496 @command{diff}, @command{diff3} and @command{sdiff} treat each line of
4619 @command{diff}, @command{diff3}, or @command{sdiff}, please report it