Buy GNU books!
|[Top]||[Contents]||[Index]||[ ? ]|
Overview Preliminary information. 1. What Comparison Means What file comparison means.
Formats for two-way difference reports. 3. Incomplete Lines Lines that lack trailing newlines. 4. Comparing Directories Comparing files and directories. 5. Making
diffsmarter or faster.
7. Comparing Three Files Formats for three-way difference reports. 8. Merging From a Common Ancestor Merging from a common ancestor.
9. Interactive Merging with
Interactive merging with
10. Merging with
patchto change old files into new ones.
11. Tips for Making and Using Patches Tips for making and using patch distributions.
Compare two files byte by byte. 13. Invoking
Compare two files line by line. 14. Invoking
Compare three files line by line. 15. Invoking
Apply a diff file to an original. 16. Invoking
Side-by-side merge of file differences.
17. Standards conformance Conformance to the POSIX standard. 18. Future Projects If you've found a bug or other shortcoming.
A. Copying This Manual How to make copies of this manual. B. Index
|webmaster||delorie software privacy|
|Copyright © 2003 by The Free Software Foundation||Updated Jun 2003|