Short Table of Contents

Overview
1. What Comparison Means
2. diff Output Formats
3. Incomplete Lines
4. Comparing Directories
5. Making diff Output Prettier
6. diff Performance Tradeoffs
7. Comparing Three Files
8. Merging From a Common Ancestor
9. Interactive Merging with sdiff
10. Merging with patch
11. Tips for Making and Using Patches
12. Invoking cmp
13. Invoking diff
14. Invoking diff3
15. Invoking patch
16. Invoking sdiff
17. Standards conformance
18. Future Projects
A. Copying This Manual
B. Concept Index