Lines Matching full:two
9 Computer users often find occasion to ask how two files differ. Perhaps one
10 file is a newer version of the other file. Or maybe the two files started
15 command to show differences between two files, or each corresponding file
16 in two directories.
32 command to show the byte and line numbers where two files differ.
34 can also show all the bytes that differ between the two files, side by side.
35 A way to compare two files character by character is the Emacs command
42 command to show differences among three files. When two people have made independent
45 can report the differences between the original and the two changed versions,
51 command to merge two files interactively.
114 There are several ways to think about the differences between two files. One
118 compares two files line by line, finds groups of lines that differ, and reports
133 Another way to think of the differences between two files is as a sequence
136 reports the differences between two files byte by byte, instead of line by
141 is useful mainly when you want to know only whether two files are identical,
151 will report that almost every byte of the two files differs.
156 to make it easy to inspect two different sets of changes to the same file.
159 When comparing two files,
164 Comparing two identical files yields one sequence of common lines and no hunks,
165 because no lines differ. Comparing two entirely different files yields no
167 general, there are many ways to match up lines between two given files.
248 considers the following two lines to be equivalent, where
268 considers the following two lines to be equivalent, where
377 This format is especially useful when comparing the contents of two directories.
382 You can also get a brief indication of whether two files differ by using
403 cannot compare directories; it can only compare two files.
408 thinks that either of the two files it is comparing is binary (a non-text
497 If you want to compare two files byte by byte, you can use the
503 option to show the values of each differing byte in the two files. With GNU
537 reports the differences between two sample input files.
539 .Ss Two Sample Input Files
540 Here are two sample files that we will use in numerous examples to illustrate
557 The two are the same,
573 The two are the same,
581 In this example, the first hunk contains just the first two lines of
599 provides two output formats that show context around the differing lines:
641 typically needs at least two lines of context.
649 for the complete contents of the two files). Notice that up to three lines
651 are the context lines. Also notice that the first two hunks have run together,
676 The two are the same,
690 for the complete contents of the two files). Notice that at most one context
719 The context output format starts with a two-line header, which looks like
758 If a hunk contains two or more lines, its line numbers look like
763 The lines of context around the lines that differ start with two space characters.
764 The lines that differ between the two files start with one of the following
817 for the complete contents of the two files):
833 The two are the same,
843 The unified output format starts with a two-line header, which looks like
875 If a hunk and its context contain two or more lines, its line numbers look
882 actually differ between the two files have one of the following indicator
989 If you are comparing two files that have meaningless or uninformative names,
1010 Here are the first two lines of the output from
1020 can produce a side by side difference listing of two files. The files are
1021 listed in two columns with a gutter between them. The gutter contains one
1058 However, when an output line represents two differing lines, one might be
1091 option. The output is split into two halves of equal width, separated by a
1098 option prints only the left column of two common lines. The
1108 for the complete contents of the two files).
1120 The two are the same, The two are the same,
1153 for the complete contents of the two files). Notice that it shows only the
1154 lines that are different between the two files.
1287 for the complete contents of the two files):
1328 command to change the two periods into one. The
1424 for the complete contents of the two files):
1441 to merge two files of C source code. The output of
1456 To merge two files, use
1884 for the complete contents of the two files):
1887 #ifndef TWO
1890 #endif /* ! TWO */
1892 #ifndef TWO
1894 #else /* TWO */
1897 #endif /* TWO */
1902 The two are the same,
1905 #ifdef TWO
1909 #endif /* TWO */
2048 reports two errors and outputs the following:
2059 to compare some or all of the files in two directory trees. When both file
2142 If you have been comparing two directories and stopped partway through, later
2151 If two directories differ only in that file names are lower case in one directory
2191 output formats are preceded by one or two characters that indicate whether
2196 provides two ways to make tab-aligned columns line up correctly.
2262 normally does not need to read two hard or symbolic links to the same file,
2346 Hunks are labeled depending on whether they are two-way or three-way, and
2357 and how various options can change it. The first two files are the same that
2375 The two are the same,
2426 lines, and two-way hunks have
2432 hunks contain copies of two or three sets of input lines each preceded by
2433 one or two commands identifying where the lines came from.
2435 Normally, two spaces precede each copy of an input line to distinguish it
2442 uses a tab instead of two spaces; this lines up tabs correctly.See Section
2481 Groups of lines that differ in two or three of the input files are called
2491 ; if just two input files differ, it is a
2492 .Em two-way hunk .
2504 hunks by merging the two-way hunks output by the two commands
2547 because it found a two-way hunk containing
2557 When two people have made changes to copies of the same file,
2569 to merge three or more sets of changes to a file by merging two change sets
2573 can incorporate changes from two modified versions into a common preceding
2574 version. This lets you merge the sets of changes represented by the two newer
2716 lines. A conflict that comes from two files
2880 The two are the same,
2953 you can merge two files interactively based on a side-by-side
3045 Concatenate the two versions, edit the result in a temporary file, then copy
3306 the first two and last two lines of context are ignored. It continues similarly
3398 Sometimes when comparing two directories, a file may exist in one directory
3871 There are two ways you can prevent
4065 is optionally POSIX-conforming; we hope it has fewer gotchas. The two methods
4134 archives of the two versions.
4202 because the two file names have different numbers of slashes, and different
4264 between the two versions, make a list of
4304 typically needs at least two lines for proper operation when patches do not
4310 command compares two files, and if they differ, tells the first byte and line
4335 outputs nothing if the two files have the same contents. If one file is a
4361 accepts. Most options have two equivalent names, one of which is a single
4521 In the simplest case, two file names
4543 If two file names are given and both are directories,
4591 accepts. Most options have two equivalent names, one of which is a single
4639 typically needs at least two lines of context.
4754 Print only the left column of two common lines in side by side format.See Section
4819 Report when two files are the same.See Section
4885 of the two, treat it as present but empty in the other.See Section
4898 typically needs at least two lines of context.
5093 Output a tab rather than two spaces before the text of a line in normal format.
5418 command merges two files and interactively outputs the results. Its arguments
5484 accepts. Each option has two equivalent names, one of which is a single letter
5544 Print only the left column of two common lines.See Section
5648 specifying the year and month the standard was adopted. Two values are currently
5769 outputs the difference between the two files, instead of the change to the
5811 It would be nice to have a feature for specifying two strings, one in
5815 which should be considered to match. Thus, if the two strings are
5819 then if two lines differ only in that
5838 When comparing two large directory structures, one of which was originally
5843 to assume that two files with the same size and time stamps have the same
6276 of the three, merge those two alternatives to suit the situation.