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.
...
RCSMERGE(1) - General Commands Manual # RCSMERGE(1) - General Commands Manual
NAME # rcsmerge - merge RCS revisions
SYNOPSIS # rcsmerge [-EV] [-k‌mode] [-p[rev]] [-q[rev]] [-x‌suffixes] [-z‌tz] -r‌rev file …
DESCRIPTION # The rcsmerge program merges changes between two revisions of an RCS file into the corresponding working file.
rcsmerge also supports keyword substitution – see the rcs(1) man page for more information.
The following options are supported:
-E
...