Contents
Index
A B C D E F G H I L M O P R S T U W 

A

A Third Sample Input File
An Example of diff3 Normal Format
An Example of If-then-else Format
An Example of Normal Format
An Example of Side by Side Format
Applying Imperfect Patches
Applying Patches in Other Directories
Applying Patches with Changed White Space
Applying Reversed Patches
Arbitrary Limits
Top|Contents

B

Backup File Names
Binary Files and Forcing Text Comparisons
Top|Contents

C

Comparing and Merging Files
Comparing Directories
Comparing Three Files
Context Format
Controlling Side by Side Format
Top|Contents

D

Detailed Description of diff3 Normal Format
Detailed Description of If-then-else Format
Detailed Description of Normal Format
diff Output Formats
diff Performance Tradeoffs
diff3 Hunks
Top|Contents

E

ed Scripts
Top|Contents

F

File Names that Contain Unusual Characters
Files that are Neither Directories Nor Regular Files
Forward ed Scripts
Future Projects
Top|Contents

G

Generating the Merged Output Directly
Top|Contents

H

Handling Changes to the Directory Structure
Handling Files that Do Not Fit in Memory
Helping patch Find Inexact Matches
How diff3 Merges Incomplete Lines
Hunks
Top|Contents

I

Ignoring Certain Changes
Incomplete Lines
Interactive Merging with sdiff
Invoking cmp
Invoking diff
Invoking diff3
Invoking patch
Invoking sdiff
Top|Contents

L

Line Formats
Line Group Formats
Top|Contents

M

Making diff Output Prettier
Making Edit Scripts
Marking Conflicts
Merge Commands
Merging Files with If-then-else
Merging From a Common Ancestor
Merging with patch
Messages and Questions from patch
Multiple Patches in a File
Top|Contents

O

Options to cmp
Options to diff
Options to diff3
Options to patch
Options to sdiff
Top|Contents

P

Paginating diff Output
Preserving Tabstop Alignment
Top|Contents

R

RCS Scripts
Reject File Names
Removing Empty Files
Reporting Bugs
Top|Contents

S

Saving the Changed File
Selecting the patch Input Format
Selecting Which Changes to Incorporate
Showing Alternate File Names
Showing Differences in Their Context
Showing Differences Side by Side
Showing Differences Without Context
Showing Which Sections Differences Are in
Specifying diff Options to sdiff
Summarizing Which Files Differ
Suppressing Case Differences
Suppressing Differences in Blank and Tab Spacing
Suppressing Differences in Blank Lines
Suppressing Lines Matching a Regular Expression
Top|Contents

T

Tips for Making Patch Distributions
Two Sample Input Files
Top|Contents

U

Unified Format
Top|Contents

W

What Comparison Means
Top|Contents