Lines Matching refs:diff3
4 documents the GNU `diff', `diff3', `sdiff', and `cmp' commands for
27 * diff3: (diff)Invoking diff3. Compare 3 files line by line.
44 documents the GNU `diff', `diff3', `sdiff', and `cmp' commands for
75 * diff3 Merging:: Merging from a common ancestor.
84 * Invoking diff3:: Compare three files line by line.
120 You can use the `diff3' command to show differences among three
122 original, `diff3' can report the differences between the original and
151 GNU `diff3' was written by Randy Smith. GNU `sdiff' was written by
199 `diff3' normally compares three input files line by line, finds
443 If `diff3' thinks that any of the files it is comparing is binary (a
445 are usually not useful. `diff3' uses the same test as `diff' to decide
448 `diff3' to consider all files to be text files and compare them line by
1862 File: diff.info, Node: Comparing Three Files, Next: diff3 Merging, Prev: diff Performance, Up: …
1867 Use the program `diff3' to compare three files and show any
1868 differences among them. (`diff3' can also merge files; see *Note diff3
1871 The "normal" `diff3' output format shows each hunk of differences
1876 *Note Invoking diff3::, for more information on how to run `diff3'.
1880 * Sample diff3 Input:: Sample `diff3' input for examples.
1881 * Detailed diff3 Normal:: A detailed description of normal output format.
1882 * diff3 Hunks:: The format of normal output format.
1883 * Example diff3 Normal:: Sample output in the normal format.
1886 File: diff.info, Node: Sample diff3 Input, Next: Detailed diff3 Normal, Up: Comparing Three Files
1892 illustrate the output of `diff3' and how various options can change it.
1912 File: diff.info, Node: Detailed diff3 Normal, Next: diff3 Hunks, Prev: Sample diff3 Input, Up: …
1914 Detailed Description of `diff3' Normal Format
1925 option, `diff3' uses a tab instead of two spaces; this lines up tabs
1950 File: diff.info, Node: diff3 Hunks, Next: Example diff3 Normal, Prev: Detailed diff3 Normal, Up…
1952 `diff3' Hunks
1956 called "diff3 hunks", by analogy with `diff' hunks (*note Hunks::). If
1957 all three input files differ in a `diff3' hunk, the hunk is called a
1962 files `A', `B', and `C', `diff3' normally finds `diff3' hunks by
1969 `h'. `diff3 F G H' might output the following:
1991 File: diff.info, Node: Example diff3 Normal, Prev: diff3 Hunks, Up: Comparing Three Files
1993 An Example of `diff3' Normal Format
1996 Here is the output of the command `diff3 lao tzu tao' (*note Sample
1997 diff3 Input::, for the complete contents of the files). Notice that it
2030 File: diff.info, Node: diff3 Merging, Next: Interactive Merging, Prev: Comparing Three Files, U…
2036 `diff3' can produce a merged output that contains both sets of changes
2041 rarely arises. You can use `diff3' to merge three or more sets of
2044 `diff3' can incorporate changes from two modified versions into a
2050 diff3 MINE OLDER YOURS
2063 `diff3' gives you several ways to handle overlaps and conflicts.
2067 `diff3' can output the merge results as an `ed' script that that can
2069 is usually better to have `diff3' generate the merged output directly;
2077 * Merging Incomplete Lines:: How `diff3' merges incomplete lines.
2081 File: diff.info, Node: Which Changes, Next: Marking Conflicts, Up: diff3 Merging
2098 Here is the output of the command `diff3' with each of these three
2099 options (*note Sample diff3 Input::, for the complete contents of the
2103 Output of `diff3 -e lao tzu tao':
2112 Output of `diff3 -3 lao tzu tao':
2117 Output of `diff3 -x lao tzu tao':
2124 File: diff.info, Node: Marking Conflicts, Next: Bypassing ed, Prev: Which Changes, Up: diff3 Me…
2129 `diff3' can mark conflicts in the merged output by bracketing them
2153 files (*note Sample diff3 Input::), `diff3 -A lao tzu tao' puts
2193 Thus `diff3 -A -L X -L Y -L Z A B C' acts like `diff3 -A A B C', except
2198 … Node: Bypassing ed, Next: Merging Incomplete Lines, Prev: Marking Conflicts, Up: diff3 Merging
2203 With the `-m' or `--merge' option, `diff3' outputs the merged file
2208 For example, the command `diff3 -m lao tzu tao' (*note Sample diff3
2236 …: Merging Incomplete Lines, Next: Saving the Changed File, Prev: Bypassing ed, Up: diff3 Merging
2238 How `diff3' Merges Incomplete Lines
2249 incomplete line is found, `diff3' generates a warning and acts as if a
2253 File: diff.info, Node: Saving the Changed File, Prev: Merging Incomplete Lines, Up: diff3 Merging
2258 Traditional Unix `diff3' generates an `ed' script without the
2259 trailing `w' and `q' commands that save the changes. System V `diff3'
2260 generates these extra commands. GNU `diff3' normally behaves like
2261 traditional Unix `diff3', but with the `-i' option it behaves like
2262 System V `diff3' and appends the `w' and `q' commands.
2268 File: diff.info, Node: Interactive Merging, Next: Merging with patch, Prev: diff3 Merging, Up: …
3405 File: diff.info, Node: Invoking diff, Next: Invoking diff3, Prev: Invoking cmp, Up: Top
3706 File: diff.info, Node: Invoking diff3, Next: Invoking patch, Prev: Invoking diff, Up: Top
3708 Invoking `diff3'
3711 The `diff3' command compares three files and outputs descriptions of
3714 diff3 OPTIONS... MINE OLDER YOURS
3717 these three file names may be `-', which tells `diff3' to read the
3720 An exit status of 0 means `diff3' was successful, 1 means some
3725 * diff3 Options:: Summary of options to `diff3'.
3728 File: diff.info, Node: diff3 Options, Up: Invoking diff3
3730 Options to `diff3'
3733 Below is a summary of all of the options that GNU `diff3' accepts.
3783 files. Thus `diff3 -L X -L Y -L Z -m A B C' acts like `diff3 -m A
3791 standard output. Unlike piping the output from `diff3' to `ed',
3822 File: diff.info, Node: Invoking patch, Next: Invoking sdiff, Prev: Invoking diff3, Up: Top
4252 `diff', `diff3' and `sdiff' treat each line of input as a string of
4381 If you think you have found a bug in GNU `cmp', `diff', `diff3', or
4820 * conflict: diff3 Merging.
4829 * diff3 hunks: diff3 Hunks.
4830 * diff3 invocation: Invoking diff3.
4831 * diff3 options: diff3 Options.
4832 * diff3 sample input: Sample diff3 Input.
4845 * format of diff3 output: Comparing Three Files.
4855 * hunks for diff3: diff3 Hunks.
4868 * invoking diff3: Invoking diff3.
4882 * merged diff3 format: Bypassing ed.
4884 * merging from a common ancestor: diff3 Merging.
4893 * options for diff3: diff3 Options.
4897 * overlap: diff3 Merging.
4932 * sample input for diff3: Sample diff3 Input.
4945 * System V diff3 compatibility: Saving the Changed File.
5019 Node: Sample diff3 Input75580
5020 Node: Detailed diff3 Normal76528
5021 Node: diff3 Hunks78307
5022 Node: Example diff3 Normal79593
5023 Node: diff3 Merging80616
5063 Node: Invoking diff3145722
5064 Node: diff3 Options146352