Lines Matching full:diff

28 .Nd apply a diff file to an original
53 .Xr diff 1
61 will attempt to determine the type of the diff listing, unless overruled by a
81 to patch must be determined for each diff listing, and that the garbage before
82 each diff listing will be examined for interesting things such as file names
114 to interpret the patch file as a context diff.
157 the number of lines of context in the context diff, ordinarily 3.
195 to interpret the patch file as a normal diff.
254 option will not work with ed diff scripts because there is too little
264 (Note: this method cannot detect a reversed patch if it is a normal diff
296 to interpret the patch file as a unified context diff (a unidiff).
367 will try to skip any leading garbage, apply the diff,
370 diff listing to
373 If the entire diff is indented by a consistent amount,
389 If no such place is found, and it is a context diff, and the maximum fuzz factor
402 (Note that the rejected hunk will come out in context diff form whether the
403 input patch was a context diff or a normal diff.
404 If the input was a normal diff, many of the contexts will simply be null.)
413 If this is different from the line number specified in the diff,
432 If the diff is a context or unified diff,
434 is able to determine the old and new file names from the diff header.
443 For a unified diff, the
453 line in the leading garbage (regardless of the diff type),
480 file names or, for a non-context diff, the
486 unified diff, and the old file was zero length, the new file name is
543 file which is patched to increment the patch level as the first diff in the
551 context diff header, or with an
559 Third, you can create a file by sending out a diff that compares a
562 diff is applied, then
569 Fifth, while you may be able to get away with putting 582 diff listings into
630 .Xr diff 1
652 bad line numbers in a normal diff when it finds a
657 A context diff using fuzz factor 3 may have the same problem.
659 a context diff in these cases to see if the changes made sense.