Lines Matching refs:hunk
246 entirely different files yields no common lines and one large hunk that
249 the total hunk size by finding large sequences of common lines
367 contain the regular expression if every changed line in the hunk---every
556 In this example, the first hunk contains just the first two lines of
557 @file{lao}, the second hunk contains the fourth line of @file{lao}
558 opposing the second and third lines of @file{tzu}, and the last hunk
709 Next come one or more hunks of differences; each hunk shows one area
722 If a hunk contains two or more lines, its line numbers look like
724 appears. An empty hunk is considered to end at the line that precedes
725 the hunk.
735 @samp{!} in the part of this hunk for the other file.
746 If all of the changes in a hunk are insertions, the lines of
821 Next come one or more hunks of differences; each hunk shows one area
830 If a hunk contains just one line, only its start line number appears.
832 An empty hunk is considered to start at the line that follows the hunk.
834 If a hunk and its context contain two or more lines, its
836 its end line number appears. An empty hunk is considered to end at
837 the line that precedes the hunk.
898 unchanged line that precedes each hunk of differences and matches the
902 that hunk unchanged. If that line is more than 40 characters long, it
1057 The ``normal'' @command{diff} output format shows each hunk of differences
1101 each hunk shows one area where the files differ. Normal format hunks
1258 to disambiguate hunk lines consisting of a single period. Like
1665 group format. For each hunk of differences in the merged output
1666 format, if the hunk contains only lines from the first file,
1667 @command{diff} uses the old line group format; if the hunk contains only
1953 included in the hunk. In this case, @command{diff} normally shifts the
1954 hunk's boundaries when this merges adjacent hunks, or shifts a hunk's
1967 The ``normal'' @command{diff3} output format shows each hunk of
2050 Each hunk begins with a line marked @samp{====}. Three-way hunks have
2053 that hunk. The hunks contain copies of two or three sets of input
2066 This hunk appears after line @var{l} of file @var{file}, and
2068 files, one must append hunk lines taken from the other files. For
2069 example, @samp{1:11a} means that the hunk follows line 11 in the first
2073 This hunk contains the lines in the range @var{r} of file @var{file}.
2077 from the other files. For example, @samp{2:11,13c} means that the hunk
2093 hunk, the hunk is called a @dfn{three-way hunk}; if just two input files
2094 differ, it is a @dfn{two-way hunk}.
2124 because it found a two-way hunk containing @samp{a} in the first and
2126 @samp{b} common to all three files, then a three-way hunk containing
2518 @command{diff} hunks (@pxref{Hunks}) one by one. If a hunk does not
2521 @command{patch} rejects the hunk and skips to the next hunk. @command{patch}
2651 @command{patch} then attempts to swap each hunk around before applying it.
2655 hunk of a patch fails, @command{patch} reverses the hunk to see if it can
2679 it attempts to find the correct place to apply each hunk of the patch.
2680 As a first guess, it takes the line number mentioned in the hunk, plus
2681 or minus any offset used in applying the previous hunk. If that is not
2683 set of lines matching the context given in the hunk.
2697 the place to install a hunk. Note that a larger fuzz factor increases
2702 If @command{patch} cannot find a place to install a hunk of the patch, it
2703 writes the hunk out to a reject file (@pxref{Reject Names}, for information
2713 as it completes each hunk @command{patch} tells you whether the hunk
2715 @command{patch} thinks the hunk should go. If this is different from the
2717 large offset @emph{may} indicate that @command{patch} installed a hunk in
3751 In context and unified format, for each hunk of differences, show some