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. ...
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. ...
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. ...