Lines Matching full:lines
115 way to think of the differences is as a series of lines that were deleted
118 compares two files line by line, finds groups of lines that differ, and reports
119 each group of differing lines. It can report the differing lines in several
127 space between words or lines.
129 also provides ways to suppress differences in alphabetic case or in lines
154 normally compares three input files line by line, finds groups of lines that
155 differ, and reports each group of differing lines. Its output is designed
161 finds sequences of lines common to both files, interspersed with groups of
162 differing lines called
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
166 common lines and one large hunk that contains all lines of both files. In
167 general, there are many ways to match up lines between two given files.
170 lines interspersed with small hunks of differing lines.
174 contains the three lines
180 contains the same three lines in reverse order
248 considers the following two lines to be equivalent, where
268 considers the following two lines to be equivalent, where
279 .Ss Suppressing Differences Whose Lines Are All Blank
283 .Op --ignore-blank-lines
284 option ignores changes that consist entirely of blank lines. With this option,
301 Normally this option affects only lines that are completely empty, but if
310 option, lines are also affected if they look empty but contain white space.
323 .Ss Suppressing Differences Whose Lines All Match a Regular Expression
324 To ignore insertions and deletions of lines that match a
329 .Op --ignore-matching-lines= Va regexp
333 ignores all changes to lines beginning with a digit.
337 only ignores the insertion or deletion of lines that contain the regular expression
344 You can specify more than one regular expression for lines to ignore by using
439 output will consist of hunks showing differences between long lines of whatever
491 to treat input lines that end in carriage return followed by newline as if
494 affects how lines are read, which in turn affects how they are compared and
581 In this example, the first hunk contains just the first two lines of
585 opposing the second and third lines of
587 and the last hunk contains just the last three lines of
592 want to see the parts of the files near the lines that differ, to help you
599 provides two output formats that show context around the differing lines:
604 lines are found.
613 can apply the diffs in this case by searching in the files for the lines of
614 context around the differing lines; if those lines are actually a few lines
625 The context output format shows several lines of context around the lines
630 .Op -C Va lines ,
631 .Op --context[= Va lines] ,
635 .Va lines
636 that some of these options take is the number of lines of context to show.
638 .Va 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,
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
769 A line that is part of a group of one or more lines that changed between the
770 two files. There is a corresponding group of lines marked with
783 If all of the changes in a hunk are insertions, the lines of
785 are omitted. If all of the changes are deletions, the lines of
792 compact because it omits redundant context lines. To select this output format,
794 .Op -U Va lines ,
795 .Op --unified[= Va lines] ,
799 .Va lines
800 is the number of lines of context to show. When it is not given, it defaults
809 typically needs at least three lines of context.
875 If a hunk and its context contain two or more lines, its line numbers look
881 The lines common to both files begin with a space character. The lines that
901 the differing lines. Which lines are \(lqsection headings\(rq is determined by a regular
904 .No Showing Lines That Match Regular Expressions
913 considers lines that match the
947 expression for such lines;
965 with the default number of lines of context. You can override that number
967 .Op -C Va lines
970 .Op -U Va lines
1010 Here are the first two lines of the output from
1026 The corresponding lines are in common. That is, either the lines are identical,
1033 The corresponding lines differ, and they are either both complete or both
1049 The corresponding lines differ, and only the first line is incomplete.
1052 The corresponding lines differ, and only the second line is incomplete.
1055 Normally, an output line is incomplete if and only if the lines that it contains
1057 .Dq Incomplete Lines .
1058 However, when an output line represents two differing lines, one might be
1067 It generates much wider output than usual, and truncates lines that are too
1084 option selects side by side format. Because side by side output lines contain
1085 two input lines, the output is wider than usual: normally 130 print columns,
1093 so that tabs line up. Input lines that are too long to fit in half of an output
1098 option prints only the left column of two common lines. The
1099 .Op --suppress-common-lines
1100 option suppresses common lines entirely.
1132 Sometimes such output is the clearest way to see how lines have changed, without
1133 the clutter of nearby unchanged lines (although you can get similar results
1134 with the context or unified formats by using 0 lines of context). However,
1154 lines that are different between the two files.
1187 comma-separated range of lines in the first file, a single character indicating
1189 lines in the second file. All line numbers are the original line numbers in
1194 Add the lines in range
1200 means append lines 12--15 of file 2 after line 8 of file 1; or, if changing
1201 file 2 into file 1, delete lines 12--15 of file 2.
1204 Replace the lines in range
1206 of the first file with lines in range
1211 means change lines 5--7 of file 1 to read as lines 8--10 of file 2; or, if
1212 changing file 2 into file 1, change lines 8--10 of file 2 to read as lines
1216 Delete the lines in range
1223 means delete lines 5--7 of file 1; or, if changing file 2 into file 1, append
1224 lines 5--7 of file 1 after line 3 of file 2.
1308 of lines do not affect how
1325 protects lines of changes that contain a single period on a line by writing
1336 comma-separated range of lines in the first file and a single character indicating
1346 means to add the following lines after line 8 of file 1.
1349 Replace the lines in range
1351 in the first file with the following lines. Like a combined add and delete,
1354 means change lines 5--7 of file 1 to read as the text file 2.
1357 Delete the lines in range
1361 means delete lines 5--7 of file 1.
1370 commands is also changed slightly: command characters precede the lines they
1372 disambiguate hunk lines consisting of a single period. Like
1376 format cannot represent incomplete lines.
1408 format's problems with lines consisting of a single period and with incomplete
1409 lines. Instead of ending text sections with a line consisting of a single
1410 period, each command specifies the number of lines it affects; a combination
1443 in this format contains all the lines of both files. Lines common to both
1497 group of similar lines.
1507 lines, and new regions are surrounded by
1511 lines.
1569 These line groups are hunks containing only lines from the first file. The
1574 These line groups are hunks containing only lines from the second file. The
1579 These line groups are hunks containing lines from both files. The default
1583 These line groups contain lines common to both files. The default unchanged
1594 stands for the lines from the first file, including the trailing newline.
1599 stands for the lines from the second file, including the trailing newline.
1603 stands for the lines common to both files, including the trailing newline.
1661 The number of lines in the group in the old file; equals
1668 Likewise, for lines in the new file.
1694 prints the number of new lines in the group in a field of width 5 characters,
1725 .Li no lines
1728 (the number of lines in the group in the new file) is 0, to
1733 .Li %dN lines
1745 for deleted lines,
1747 for added lines, and a space for unchanged lines. The formats contain newline
1767 formats lines just from the first file.
1770 formats lines just from the second file.
1773 formats lines common to both files.
1776 formats all lines; in effect, it sets all three above options simultaneously.
1788 .Dq Incomplete Lines .
1914 For lines common to both files,
1917 merged output format, if the hunk contains only lines from the first file,
1919 uses the old line group format; if the hunk contains only lines from the second
1926 The old, new, and unchanged line formats specify the output format of lines
1927 from the first file, lines from the second file, and lines common to both
1954 option, you should check that if the differing lines contain any of the C
1977 .Sh Incomplete Lines
1981 because its last character is not a newline. All other lines are called
1982 .Em full lines
1983 and end in a newline character. Incomplete lines do not match full lines unless
1993 line. The side by side format normally represents incomplete lines as-is,
2140 option. Trailing white space and empty lines are ignored in the pattern file.
2189 The lines of text in some of the
2226 correctly. Its disadvantage is that it can make long lines too long to fit
2284 determines which lines have changed always comes up with a near-minimal set
2315 .Op --horizon-lines= Va lines
2319 .Va lines
2320 lines of the prefix and the first
2321 .Va lines
2322 lines of the suffix. This gives
2326 Suppose a run of changed lines includes a sequence of lines at one end and
2327 there is an identical sequence of lines just outside the other end. The
2333 shifts a hunk's lines towards the end of the file. Merging hunks can make
2347 lines are annotated by their location in the input files.
2387 for the complete contents of the files). Notice that it shows only the lines
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.
2442 uses a tab instead of two spaces; this lines up tabs correctly.See Section
2454 and contains no lines in that file. To edit this file to yield the other files,
2455 one must append hunk lines taken from the other files. For example,
2457 means that the hunk follows line 11 in the first file and contains no lines
2461 This hunk contains the lines in the range
2469 the specified lines to be the lines taken from the other files. For example,
2471 means that the hunk contains lines 11 through 13 from the second file.
2474 If the last line in a set of input lines is incomplete (see Section
2475 .Dq Incomplete Lines ) ,
2481 Groups of lines that differ in two or three of the input files are called
2513 contains the three lines
2518 contains the lines
2524 contains the lines
2615 lines.
2716 lines. A conflict that comes from two files
2724 lines from A
2726 lines from B
2739 lines from A
2741 lines from B
2743 lines from C
2894 .Ss How Xr diff3 Merges Incomplete Lines
2897 incomplete lines (see Section
2898 .Dq Incomplete Lines )
2984 --ignore-blank-lines --ignore-case
2985 --ignore-matching-lines=regexp --ignore-space-change
2988 --strip-trailing-cr --suppress-common-lines
3001 .Op --suppress-common-lines .
3031 Groups of common lines, with a blank gutter, are copied from the first file
3032 to the output. After each group of differing lines,
3051 except precede each version with a header that shows what file and lines the
3074 Silently copy common lines.
3077 Verbosely copy common lines. This is the default.
3212 to lines beginning with
3268 anywhere. But most patches add or change lines rather than delete them, so
3295 scans both forward and backward for a set of lines matching the context given
3300 looks for a place where all lines of the context match. If it cannot find
3306 the first two and last two lines of context are ignored. It continues similarly
3310 .Op -F Va lines
3312 .Op --fuzz= Va lines
3314 .Va lines .
3316 .Va lines
3317 lines while looking for the place to install a hunk. Note that a larger fuzz
3319 is 2; there is no point to setting it to more than the number of lines of
3359 using a fuzz factor equal to or greater than the number of lines of context
4179 can analyze files with arbitrarily long lines and files that end in incomplete
4180 lines. However, older versions of
4301 You can also shrink the patch size by using fewer lines of context, but bear
4304 typically needs at least two lines for proper operation when patches do not
4312 Bytes and lines are numbered starting with 1. The arguments of
4617 .It --ignore-blank-lines
4618 Ignore changes that just insert or delete blank lines.See Section
4619 .Dq Blank Lines .
4626 Use the context output format, showing three lines of context.See Section
4629 .It -C Va lines
4630 .It --context[= Va lines]
4632 .Va lines
4633 (an integer) lines of context, or three if
4634 .Va lines
4639 typically needs at least two lines of context.
4644 .Op - Va lines
4652 .Op -C Va lines
4658 to output a line group containing differing lines from both files in if-then-else
4713 .It --horizon-lines= Va lines
4715 .Va lines
4716 lines of the common prefix and the first
4717 .Va lines
4718 lines of the common suffix.See Section
4727 .It --ignore-matching-lines= Va regexp
4728 Ignore changes that just insert or delete lines that match
4730 See Section.Dq Specified Lines .
4754 Print only the left column of two common lines in side by side format.See Section
4760 to output all input lines in if-then-else format.See Section
4767 except that each command specifies the number of lines affected.See Section
4779 to output a group of lines taken from just the second file in if-then-else
4792 to output a group of lines taken from just the first file in if-then-else
4838 .It --suppress-common-lines
4839 Do not print common lines in side by side format.See Section
4868 Use the unified output format, showing three lines of context.See Section
4874 to output a group of common lines taken from both files in if-then-else format.See Section
4888 .It -U Va lines
4889 .It --unified[= Va lines]
4891 .Va lines
4892 (an integer) lines of context, or three if
4893 .Va lines
4898 typically needs at least two lines of context.
4903 .Op - Va lines
4909 .Op -U Va lines
4918 Ignore white space when comparing lines.See Section
4994 surrounding conflicts with bracket lines.See Section
5019 except bracket lines from overlapping changes' first and third files.See Section
5027 lines from mine
5029 lines from yours
5082 this works even for binary files and incomplete lines.
5260 .It -F Va lines
5261 .It --fuzz= Va lines
5263 .Va lines .
5506 .It --ignore-blank-lines
5507 Ignore changes that just insert or delete blank lines.See Section
5508 .Dq Blank Lines .
5537 .It --ignore-matching-lines= Va regexp
5538 Ignore changes that just insert or delete lines that match
5540 See Section.Dq Specified Lines .
5544 Print only the left column of two common lines.See Section
5554 .It --suppress-common-lines
5555 Do not print common lines.See Section
5599 Ignore white space when comparing lines.See Section
5819 then if two lines differ only in that
5823 in file 2, the lines are treated as identical.