Lines Matching refs:diff3

9 This file documents the the GNU @code{diff}, @code{diff3}, @code{sdiff},
39 @subtitle @code{diff}, @code{diff3}, @code{sdiff}, @code{cmp}, and @code{patch}
66 This file documents the the GNU @code{diff}, @code{diff3}, @code{sdiff},
83 * diff3 Merging::	Merging from a common ancestor.
90 * Invoking diff3::	How to run @code{diff3} and a summary of its options.
123 You can use the @code{diff3} command to show differences among three
125 original, @code{diff3} can report the differences between the original
164 GNU @code{diff3} was written by Randy Smith.  GNU @code{sdiff} was
210 @code{diff3} normally compares three input files line by line, finds
443 If @code{diff3} thinks that any of the files it is comparing is binary
445 comparisons are usually not useful.  @code{diff3} uses the same test as
448 text files, you can force @code{diff3} to consider all files to be text
1775 @node Comparing Three Files, diff3 Merging, diff Performance, Top
1778 @cindex format of @code{diff3} output
1780 Use the program @code{diff3} to compare three files and show any
1781 differences among them.  (@code{diff3} can also merge files; see
1782 @ref{diff3 Merging}).
1784 The ``normal'' @code{diff3} output format shows each hunk of
1789 @xref{Invoking diff3}, for more information on how to run @code{diff3}.
1792 * Sample diff3 Input::		Sample @code{diff3} input for examples.
1793 * Detailed diff3 Normal::	A detailed description of normal output format.
1794 * diff3 Hunks::			The format of normal output format.
1795 * Example diff3 Normal::	Sample output in the normal format.
1798 @node Sample diff3 Input, Detailed diff3 Normal, , Comparing Three Files
1800 @cindex @code{diff3} sample input
1801 @cindex sample input for @code{diff3}
1804 the output of @code{diff3} and how various options can change it.  The
1825 @node Detailed diff3 Normal, diff3 Hunks, Sample diff3 Input, Comparing Three Files
1826 @section Detailed Description of @code{diff3} Normal Format
1837 option, @code{diff3} uses a tab instead of two spaces; this lines up
1863 @node diff3 Hunks, Example diff3 Normal, Detailed diff3 Normal, Comparing Three Files
1864 @section @code{diff3} Hunks
1865 @cindex hunks for @code{diff3}
1866 @cindex @code{diff3} hunks
1869 called @dfn{diff3 hunks}, by analogy with @code{diff} hunks
1870 (@pxref{Hunks}).  If all three input files differ in a @code{diff3}
1875 files @samp{A}, @samp{B}, and @samp{C}, @code{diff3} normally finds
1876 @code{diff3} hunks by merging the two-way hunks output by the two
1883 @samp{h}.  @samp{diff3 F G H} might output the following:
1907 @node Example diff3 Normal, , diff3 Hunks, Comparing Three Files
1908 @section An Example of @code{diff3} Normal Format
1910 Here is the output of the command @samp{diff3 lao tzu tao}
1911 (@pxref{Sample diff3 Input}, for the complete contents of the files).
1946 @node diff3 Merging, Interactive Merging, Comparing Three Files, Top
1951 @code{diff3} can produce a merged output that contains both sets of
1956 need rarely arises.  You can use @code{diff3} to merge three or more
1959 @code{diff3} can incorporate changes from two modified versions into a
1966 diff3 @var{mine} @var{older} @var{yours}
1984 @code{diff3} gives you several ways to handle overlaps and conflicts.
1988 @code{diff3} can output the merge results as an @code{ed} script that
1990 However, it is usually better to have @code{diff3} generate the merged
1997 * Merging Incomplete Lines::	How @code{diff3} merges incomplete lines.
2001 @node Which Changes, Marking Conflicts, , diff3 Merging
2020 Here is the output of the command @code{diff3} with each of these three
2021 options (@pxref{Sample diff3 Input}, for the complete contents of the files).
2025 Output of @samp{diff3 -e lao tzu tao}:
2036 Output of @samp{diff3 -3 lao tzu tao}:
2043 Output of @samp{diff3 -x lao tzu tao}:
2051 @node Marking Conflicts, Bypassing ed, Which Changes, diff3 Merging
2056 @code{diff3} can mark conflicts in the merged output by
2084 given the sample input files (@pxref{Sample diff3 Input}), @samp{diff3
2132 times, once for each input file.  Thus @samp{diff3 -A -L X -L Y -L Z A
2133 B C} acts like @samp{diff3 -A A B C}, except that the output looks like
2137 @node Bypassing ed, Merging Incomplete Lines, Marking Conflicts, diff3 Merging
2139 @cindex merged @code{diff3} format
2141 With the @samp{-m} or @samp{--merge} option, @code{diff3} outputs the
2147 For example, the command @samp{diff3 -m lao tzu tao}
2148 (@pxref{Sample diff3 Input} for a copy of the input files) would output
2177 @node Merging Incomplete Lines, Saving the Changed File, Bypassing ed, diff3 Merging
2178 @section How @code{diff3} Merges Incomplete Lines
2189 incomplete line is found, @code{diff3} generates a warning and acts as
2192 @node Saving the Changed File, , Merging Incomplete Lines, diff3 Merging
2194 @cindex System V @code{diff3} compatibility
2196 Traditional Unix @code{diff3} generates an @code{ed} script without the
2198 System V @code{diff3} generates these extra commands.  GNU @code{diff3}
2199 normally behaves like traditional Unix @code{diff3}, but with the
2200 @samp{-i} option it behaves like System V @code{diff3} and appends the
2207 @node Interactive Merging, Merging with patch, diff3 Merging, Top
2735 @node Invoking diff, Invoking diff3, Invoking cmp, Top
3092 @node Invoking diff3, Invoking patch, Invoking diff, Top
3093 @chapter Invoking @code{diff3}
3094 @cindex invoking @code{diff3}
3095 @cindex @code{diff3} invocation
3097 The @code{diff3} command compares three files and outputs descriptions
3101 diff3 @var{options}@dots{} @var{mine} @var{older} @var{yours}
3106 which tells @code{diff3} to read the standard input for that file.
3108 An exit status of 0 means @code{diff3} was successful, 1 means some
3112 * diff3 Options::		Summary of options to @code{diff3}.
3115 @node diff3 Options, , , Invoking diff3
3116 @section Options to @code{diff3}
3117 @cindex @code{diff3} options
3118 @cindex options for @code{diff3}
3120 Below is a summary of all of the options that GNU @code{diff3}
3175 the input files.  Thus @samp{diff3 -L X -L Y -L Z -m A B C} acts like
3176 @samp{diff3 -m A B C}, except that the output looks like it came from
3183 output.  Unlike piping the output from @code{diff3} to @code{ed}, this
3211 Output the version number of @code{diff3}.
3227 @node Invoking patch, Invoking sdiff, Invoking diff3, Top
3898 @code{diff3}, @code{sdiff}, or @code{patch}, please report it by