CHANGELIST(5) - File Formats Manual # CHANGELIST(5) - File Formats Manual
NAME # changelist - list of backup files
DESCRIPTION # The /etc/changelist file is a simple text file containing the names of files to be backed up and checked for modification by the system security script, security(8). It is checked daily by the /etc/daily script. See daily(8) for further details.
Each line of the file contains the name of a file, specified by its absolute pathname, one per line.
...
CMP(1) - General Commands Manual # CMP(1) - General Commands Manual
NAME # cmp - compare two files
SYNOPSIS # cmp [-l | -s] file1 file2 [skip1 [skip2]]
DESCRIPTION # The cmp utility compares two files of any type and writes the results to the standard output. By default, cmp is silent if the files are the same; if they differ, the byte and line number at which the first difference occurred is reported.
...
COMM(1) - General Commands Manual # COMM(1) - General Commands Manual
NAME # comm - select or reject lines common to two files
SYNOPSIS # comm [-123f] file1Â file2
DESCRIPTION # The comm utility reads file1 and file2, which should be sorted lexically, and produces three text columns as output: lines only in file1; lines only in file2; and lines in both files.
The filename ‘-’ means the standard input.
...
DIFF(1) - General Commands Manual # DIFF(1) - General Commands Manual
NAME # diff - differential file and directory comparator
SYNOPSIS # diff [-abdipTtw] [-c | -e | -f | -n | -q | -u] [-I pattern] [-L label] file1 file2
diff [-abdipTtw] [-IÂ pattern] [-LÂ label] -CÂ number file1Â file2
diff [-abditw] [-IÂ pattern] -DÂ string file1Â file2
diff [-abdipTtw] [-IÂ pattern] [-LÂ label] -UÂ number file1Â file2
...
DIFF3(1) - General Commands Manual # DIFF3(1) - General Commands Manual
NAME # diff3 - 3-way differential file comparison
SYNOPSIS # diff3 [-3aEeXx] file1Â file2Â file3
DESCRIPTION # The diff3 utility compares the contents of three different versions of a file, file1, file2 and file3, writing the result to the standard output. The options describe different methods of merging and purging the separate versions into a new file. diff3 is used by rcs(1) to merge specific versions or create new versions.
...
MERGE(1) - General Commands Manual # MERGE(1) - General Commands Manual
NAME # merge - 3-way file merge
SYNOPSIS # merge [-EepqV] [-LÂ label] file1Â file2Â file3
DESCRIPTION # The merge program merges changes leading from file2 to file3 into file1.
The following options are supported:
-E
Default merge: see diff3(1) for details.
-e
Same as -E but does not warn about conflicts.
-L label
Specifies labels to be used in place of corresponding file names in conflict reports.
...
PATCH(1) - General Commands Manual # PATCH(1) - General Commands Manual
NAME # patch - apply a diff file to an original
SYNOPSIS # patch [-bCcEeflNnRstuv] [-B backup-prefix] [-D symbol] [-d directory] [-F max-fuzz] [-i patchfile] [-o out-file] [-p strip-count] [-r rej-name] [-V t | nil | never] [-x number] [-z backup-ext] [--posix] [origfile [patchfile]]
patch <patchfile
DESCRIPTION # patch takes the text file patchfile containing any of the four forms of difference listing produced by the diff(1) program and applies those differences to an original text file, producing a patched version.
...
RCSDIFF(1) - General Commands Manual # RCSDIFF(1) - General Commands Manual
NAME # rcsdiff - compare RCS revisions
SYNOPSIS # rcsdiff [-cnquV] [-k‌mode] [-r‌rev] [-x‌suffixes] [-z‌tz] [diff_options] file …
DESCRIPTION # The rcsdiff program is used to compare revisions of RCS files, in much the same way as the diff(1) utility. Differences between two specific revisions can be requested, as well as differences between the current working file and the latest revision of the default branch.
...
SDIFF(1) - General Commands Manual # SDIFF(1) - General Commands Manual
NAME # sdiff - side-by-side diff
SYNOPSIS # sdiff [-abdilstW] [-I regexp] [-o outfile] [-w width] file1 file2
DESCRIPTION # sdiff displays two files side by side, with any differences between the two highlighted as follows: new lines are marked with ‘>’; deleted lines are marked with ‘<’; and changed lines are marked with ‘|’.
sdiff can also be used to interactively merge two files, prompting at each set of differences.
...
UNIFDEF(1) - General Commands Manual # UNIFDEF(1) - General Commands Manual
NAME # unifdef - remove preprocessor conditionals from code
SYNOPSIS # unifdef [-BbcdehKkmnSstV] [-[i]D‌sym[=val]] [-[i]U‌sym] [-f defile] [-M backext] [-o outfile] [-x 0 | 1 | 2] file …
DESCRIPTION # The unifdef utility selectively processes conditional cpp(1) directives. It removes from a file both the directives and any additional text that they specify should be removed, while otherwise leaving the file alone.
...