Lines Matching refs:hunks

240 @cindex hunks
244 @dfn{hunks}.  Comparing two identical files yields one sequence of
245 common lines and no hunks, because no lines differ.  Comparing two
250 interspersed with small hunks of differing lines.
442 newline characters, and the @command{diff} output will consist of hunks
621 hunks have run together, because their contents overlap.
709 Next come one or more hunks of differences; each hunk shows one area
710 where the files differ.  Context format hunks look like this:
821 Next come one or more hunks of differences; each hunk shows one area
822 where the files differ.  Unified format hunks look like this:
1100 The normal output format consists of one or more hunks of differences;
1101 each hunk shows one area where the files differ.  Normal format hunks
1205 The @command{ed} output format consists of one or more hunks of
1209 format hunks look like this:
1255 with hunks in forward (front to back) order.  The format of the commands
1415 These line groups are hunks containing only lines from the first file.
1420 These line groups are hunks containing only lines from the second
1426 These line groups are hunks containing lines from both files.  The
1954 hunk's boundaries when this merges adjacent hunks, or shifts a hunk's
1955 lines towards the end of the file.  Merging hunks can make the output
2050 Each hunk begins with a line marked @samp{====}.  Three-way hunks have
2051 plain @samp{====} lines, and two-way hunks have @samp{1}, @samp{2}, or
2053 that hunk.  The hunks contain copies of two or three sets of input
2087 @cindex hunks for @command{diff3}
2088 @cindex @command{diff3} hunks
2091 called @dfn{diff3 hunks}, by analogy with @command{diff} hunks
2098 @command{diff3} hunks by merging the two-way hunks output by the two
2518 @command{diff} hunks (@pxref{Hunks}) one by one.  If a hunk does not
2523 hunks (if any) into @samp{@var{f}.rej}.
2704 on how reject files are named).  It writes out rejected hunks in context
2707 line numbers on the hunks in the reject file may be different from those
2709 thinks the failed hunks belong in the new file rather than in the old
3067 @command{patch} exits with status 0 if all hunks are applied successfully,
3068 1 if some hunks cannot be applied, and 2 if there is more serious trouble.
3260 the number of bad hunks, or with status 1 if there was real trouble.
3261 Now @command{patch} exits with status 1 if some hunks failed, or with