Linux Diff Utility Manual

Podręcznik GNU Linux Diffutils referencyjny

GNU Diffutils is a package of several programs related to finding differences between files.

Computer users often find occasion to ask how two files differ. Perhaps one file is a newer version of the other file. Or maybe the two files started out as identical copies but were changed by different people.

You can use the diff command to show differences between two files, or each corresponding file in two directories. diff outputs differences between files line by line in any of several formats, selectable by command line options. This set of differences is often called a ‘diff’ or ‘patch’. For files that are identical, diff normally produces no output; for binary (non-text) files, diff normally reports only that they are different.

You can use the cmp command to show the offsets and line numbers where two files differ. cmp can also show all the characters that differ between the two files, side by side.

You can use the diff3 command to show differences among three files. When two people have made independent changes to a common original, diff3 can report the differences between the original and the two changed versions, and can produce a merged file that contains both persons' changes together with warnings about conflicts.

You can use the sdiff command to merge two files interactively.

The Diffutils Reference Manual provides beginners with a simple introduction to the basics, and experts will find advanced details they need.

In this you will see the following things below.

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

Appendix A Copying This Manual

Appendix B Translations of This Manual

Appendix C Index

You will find all this section offline without any internet connection and learn Diffutils easily anywhere and anytime.