|Comparing and Merging Files with GNU diff and patch|
by David MacKenzie, Paul Eggert, and Richard Stallman
Paperback (6"x9"), 120 pages
RRP £12.95 ($19.95)
"Well packaged... the quality of information is excellent" --- Linux User and Developer Magazine (Issue 36, Feb 2004) Get a printed copy>>>
14.1 Options to
Below is a summary of all of the options that GNU
accepts. Multiple single letter options (unless they take an argument)
can be combined into a single command line argument.
- Treat all files as text and compare them line-by-line, even if they do not appear to be text. See section 1.7 Binary Files and Forcing Text Comparisons.
- Incorporate all unmerged changes from older to yours into mine, surrounding conflicts with bracket lines. See section 8.2 Marking Conflicts.
Use the compatible comparison program program to compare files
edscript that incorporates all the changes from older to yours into mine. See section 8.1 Selecting Which Changes to Incorporate.
-e, except bracket lines from overlapping changes' first and third files. See section 8.2 Marking Conflicts. With
-E, an overlapping change looks like this:
<<<<<<< mine lines from mine ======= lines from yours >>>>>>> yours
- Output a summary of usage and then exit.
Generate ‘w’ and ‘q’ commands at the end of the
edscript for System V compatibility. This option must be combined with one of the
-AeExX3options, and may not be combined with
-m. See section 8.5 Saving the Changed File.
Use the label label for the brackets output by the
-Xoptions. This option may be given up to three times, one for each input file. The default labels are the names of the input files. Thus ‘diff3 -L X -L Y -L Z -m A B C’ acts like ‘diff3 -m A B C’, except that the output looks like it came from files named ‘X’, ‘Y’ and ‘Z’ rather than from files named ‘A’, ‘B’ and ‘C’. See section 8.2 Marking Conflicts.
Apply the edit script to the first file and send the result to standard
output. Unlike piping the output from
ed, this works even for binary files and incomplete lines.
-Ais assumed if no edit script option is specified. See section 8.3 Generating the Merged Output Directly.
- Output a tab rather than two spaces before the text of a line in normal format. This causes the alignment of tabs in the line to look normal. See section 5.1 Preserving Tab Stop Alignment.
- Output version information and then exit.
-e, except output only the overlapping changes. See section 8.1 Selecting Which Changes to Incorporate.
-E, except output only the overlapping changes. In other words, like
-x, except bracket changes as in
-E. See section 8.2 Marking Conflicts.
-e, except output only the nonoverlapping changes. See section 8.1 Selecting Which Changes to Incorporate.
|ISBN 0954161750||Comparing and Merging Files with GNU diff and patch||See the print edition|