- publishing free software manuals
Comparing and Merging Files with GNU diff and patch
by David MacKenzie, Paul Eggert, and Richard Stallman
Paperback (6"x9"), 120 pages
ISBN 0954161750
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>>>

7 Comparing Three Files

Use the program diff3 to compare three files and show any differences among them. (diff3 can also merge files; see section 8 Merging From a Common Ancestor).

The "normal" diff3 output format shows each hunk of differences without surrounding context. Hunks are labeled depending on whether they are two-way or three-way, and lines are annotated by their location in the input files.

See section 14 Invoking diff3, for more information on how to run diff3.

ISBN 0954161750Comparing and Merging Files with GNU diff and patchSee the print edition