| 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>>> |
14 Invoking diff3
The diff3 command compares three files and outputs descriptions
of their differences. Its arguments are as follows:
diff3 options... mine older yours
The files to compare are mine, older, and yours.
At most one of these three file names may be ‘-’,
which tells diff3 to read the standard input for that file.
An exit status of 0 means diff3 was successful, 1 means some
conflicts were found, and 2 means trouble.
| ISBN 0954161750 | Comparing and Merging Files with GNU diff and patch | See the print edition |