Lines Matching refs:hunk

224 files yields no common lines and one large hunk that contains all lines
226 between two given files.  `diff' tries to minimize the total hunk size
339 contain the regular expression if every changed line in the hunk--every
509    In this example, the first hunk contains just the first two lines of
510 `lao', the second hunk contains the fourth line of `lao' opposing the
511 second and third lines of `tzu', and the last hunk contains just the
520    The "normal" `diff' output format shows each hunk of differences
543 differences; each hunk shows one area where the files differ.  Normal
680    Next come one or more hunks of differences; each hunk shows one area
699      marked with `!' in the part of this hunk for the other file.
709    If all of the changes in a hunk are insertions, the lines of
824    Next come one or more hunks of differences; each hunk shows one area
916 unchanged line that precedes each hunk of differences and matches the
920 hunk unchanged.  If that line is more than 40 characters long, they
1197 to disambiguate hunk lines consisting of a single period.  Like `ed'
1551 format.  For each hunk of differences in the merged output format, if
1552 the hunk contains only lines from the first file, `diff' uses the old
1553 line group format; if the hunk contains only lines from the second
1856 included in the hunk.  In this case, `diff' normally shifts the hunk's
1857 boundaries when this merges adjacent hunks, or shifts a hunk's lines
1871    The "normal" `diff3' output format shows each hunk of differences
1917    Each hunk begins with a line marked `===='.  Three-way hunks have
1919 specify which of the three input files differ in that hunk.  The hunks
1931      This hunk appears after line L of file FILE, and contains no lines
1933      must append hunk lines taken from the other files.  For example,
1934      `1:11a' means that the hunk follows line 11 in the first file and
1938      This hunk contains the lines in the range R of file FILE.  The
1943      the hunk contains lines 11 through 13 from the second file.
1957 all three input files differ in a `diff3' hunk, the hunk is called a
1958 "three-way hunk"; if just two input files differ, it is a "two-way
1959 hunk".
1985 because it found a two-way hunk containing `a' in the first and third
1987 all three files, then a three-way hunk containing the last line of each
2386 `diff' hunks (*note Hunks::) one by one.  If a hunk does not exactly
2389 rejects the hunk and skips to the next hunk.  `patch' normally replaces
2518 attempts to swap each hunk around before applying it.  Rejects come out
2522 hunk of a patch fails, `patch' reverses the hunk to see if it can apply
2547 it attempts to find the correct place to apply each hunk of the patch.
2548 As a first guess, it takes the line number mentioned in the hunk, plus
2549 or minus any offset used in applying the previous hunk.  If that is not
2551 lines matching the context given in the hunk.
2565 hunk.  Note that a larger fuzz factor increases the odds of making a
2570    If `patch' cannot find a place to install a hunk of the patch, it
2571 writes the hunk out to a reject file (*note Reject Names::, for
2580    If the `--verbose' option is given, then as it completes each hunk
2581 `patch' tells you whether the hunk succeeded or failed, and if it
2582 failed, on which line (in the new file) `patch' thinks the hunk should
2585 `patch' installed a hunk in the wrong place.  `patch' also tells you if
3525      In context and unified format, for each hunk of differences, show