--- /dev/null
+diff -Nru diffutils-2.7/man/cmp.1 diffutils-2.7.new/man/cmp.1
+--- diffutils-2.7/man/cmp.1 Thu Jan 1 01:00:00 1970
++++ diffutils-2.7.new/man/cmp.1 Sun Mar 21 14:45:00 1999
+@@ -0,0 +1,107 @@
++.\" Copyright (c) 1987, 1990, 1993
++.\" The Regents of the University of California. All rights reserved.
++.\"
++.\" This code is derived from software contributed to Berkeley by
++.\" the Institute of Electrical and Electronics Engineers, Inc.
++.\"
++.\" Redistribution and use in source and binary forms, with or without
++.\" modification, are permitted provided that the following conditions
++.\" are met:
++.\" 1. Redistributions of source code must retain the above copyright
++.\" notice, this list of conditions and the following disclaimer.
++.\" 2. Redistributions in binary form must reproduce the above copyright
++.\" notice, this list of conditions and the following disclaimer in the
++.\" documentation and/or other materials provided with the distribution.
++.\" 3. All advertising materials mentioning features or use of this software
++.\" must display the following acknowledgement:
++.\" This product includes software developed by the University of
++.\" California, Berkeley and its contributors.
++.\" 4. Neither the name of the University nor the names of its contributors
++.\" may be used to endorse or promote products derived from this software
++.\" without specific prior written permission.
++.\"
++.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
++.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
++.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++.\" SUCH DAMAGE.
++.\"
++.\" @(#)cmp.1 8.1 (Berkeley) 6/6/93
++.\"
++.Dd June 6, 1993
++.Dt CMP 1
++.Os
++.Sh NAME
++.Nm cmp
++.Nd compare two files
++.Sh SYNOPSIS
++.Nm cmp
++.Op Fl l | Fl s
++.Ar file1 file2
++.Op Ar skip1 Op Ar skip2
++.Sh DESCRIPTION
++The cmp utility compares two files of any type and writes the results
++to the standard output.
++By default,
++.Nm
++is silent if the files are the same; if they differ, the byte
++and line number at which the first difference occurred is reported.
++.Pp
++Bytes and lines are numbered beginning with one.
++.Pp
++The following options are available:
++.Bl -tag -width flag
++.It Fl l
++Print the byte number (decimal) and the differing
++byte values (octal) for each difference.
++.It Fl s
++Print nothing for differing files; return exit
++status only.
++.El
++.Pp
++The optional arguments
++.Ar skip1
++and
++.Ar skip2
++are the byte offsets from the beginning of
++.Ar file1
++and
++.Ar file2 ,
++respectively, where the comparison will begin.
++The offset is decimal by default, but may be expressed as an hexadecimal
++or octal value by preceding it with a leading ``0x'' or ``0''.
++.Pp
++The
++.Nm cmp
++utility exits with one of the following values:
++.Bl -tag -width 4n
++.It 0
++The files are identical.
++.It 1
++The files are different; this includes the case
++where one file is identical to the first part of
++the other.
++In the latter case, if the
++.Fl s
++option has not been specified,
++.Nm cmp
++writes to standard output that EOF was reached in the shorter
++file (before any differences were found).
++.It >1
++An error occurred.
++.El
++.Sh SEE ALSO
++.Xr diff 1 ,
++.Xr diff3 1
++.Sh STANDARDS
++The
++.Nm cmp
++utility is expected to be
++.St -p1003.2
++compatible.
+diff -Nru diffutils-2.7/man/diff.1 diffutils-2.7.new/man/diff.1
+--- diffutils-2.7/man/diff.1 Thu Jan 1 01:00:00 1970
++++ diffutils-2.7.new/man/diff.1 Sun Mar 21 14:45:00 1999
+@@ -0,0 +1,473 @@
++.TH DIFF 1 "22sep1993" "GNU Tools" "GNU Tools"
++.SH NAME
++diff \- find differences between two files
++.SH SYNOPSIS
++.B diff
++[options] from-file to-file
++.SH DESCRIPTION
++In the simplest case,
++.I diff
++compares the contents of the two files
++.I from-file
++and
++.IR to-file .
++A file name of
++.B \-
++stands for
++text read from the standard input. As a special case,
++.B "diff \- \-"
++compares a copy of standard input to itself.
++
++If
++.I from-file
++is a directory and
++.I to-file
++is not,
++.I diff
++compares the file in
++.I from-file
++whose file name is that of
++.IR to-file ,
++and vice versa. The non-directory file must not be
++.BR \- .
++
++If both
++.I from-file
++and
++.I to-file
++are directories,
++.I diff
++compares corresponding files in both directories, in
++alphabetical order; this comparison is not recursive unless the
++.B \-r
++or
++.B \-\-recursive
++option is given.
++.I diff
++never
++compares the actual contents of a directory as if it were a file. The
++file that is fully specified may not be standard input, because standard
++input is nameless and the notion of ``file with the same name'' does not
++apply.
++
++.B diff
++options begin with
++.BR \- ,
++so normally
++.I from-file
++and
++.I to-file
++may not begin with
++.BR \- .
++However,
++.B \-\-
++as an
++argument by itself treats the remaining arguments as file names even if
++they begin with
++.BR \- .
++.SS Options
++Below is a summary of all of the options that GNU
++.I diff
++accepts.
++Most options have two equivalent names, one of which is a single letter
++preceded by
++.BR \- ,
++and the other of which is a long name preceded by
++.BR \-\- .
++Multiple single letter options (unless they take an
++argument) can be combined into a single command line word:
++.B \-ac
++is
++equivalent to
++.BR "\-a \-c" .
++Long named options can be abbreviated to
++any unique prefix of their name. Brackets
++.RB ( [
++and
++.BR ] )
++indicate that an
++option takes an optional argument.
++.TP
++.BI \- lines
++Show
++.I lines
++(an integer) lines of context. This option does not
++specify an output format by itself; it has no effect unless it is
++combined with
++.B \-c
++or
++.BR \-u .
++This option is obsolete. For proper
++operation,
++.I patch
++typically needs at least two lines of context.
++.TP
++.B \-a
++Treat all files as text and compare them line-by-line, even if they
++do not seem to be text.
++.TP
++.B \-b
++Ignore changes in amount of white space.
++.TP
++.B \-B
++Ignore changes that just insert or delete blank lines.
++.TP
++.B \-\-brief
++Report only whether the files differ, not the details of the
++differences.
++.TP
++.B \-c
++Use the context output format.
++.TP
++.BI "\-C " lines
++.br
++.ns
++.TP
++.BI \-\-context[= lines ]
++Use the context output format, showing
++.I lines
++(an integer) lines of
++context, or three if
++.I lines
++is not given.
++For proper operation,
++.I patch
++typically needs at least two lines of
++context.
++.TP
++.BI \-\-changed\-group\-format= format
++Use
++.I format
++to output a line group containing differing lines from
++both files in if-then-else format.
++.TP
++.B \-d
++Change the algorithm to perhaps find a smaller set of changes. This makes
++.I diff
++slower (sometimes much slower).
++.TP
++.BI "\-D " name
++Make merged if-then-else format output, conditional on the preprocessor
++macro
++.IR name .
++.TP
++.B \-e
++.br
++.ns
++.TP
++.B \-\-ed
++Make output that is a valid
++.I ed
++script.
++.TP
++.BI \-\-exclude= pattern
++When comparing directories, ignore files and subdirectories whose basenames
++match
++.IR pattern .
++.TP
++.BI \-\-exclude\-from= file
++When comparing directories, ignore files and subdirectories whose basenames
++match any pattern contained in
++.IR file .
++.TP
++.B \-\-expand\-tabs
++Expand tabs to spaces in the output, to preserve the alignment of tabs
++in the input files.
++.TP
++.B \-f
++Make output that looks vaguely like an
++.I ed
++script but has changes
++in the order they appear in the file.
++.TP
++.BI "\-F " regexp
++In context and unified format, for each hunk of differences, show some
++of the last preceding line that matches
++.IR regexp .
++.TP
++.B \-\-forward\-ed
++Make output that looks vaguely like an
++.B ed
++script but has changes
++in the order they appear in the file.
++.TP
++.B \-h
++This option currently has no effect; it is present for Unix
++compatibility.
++.TP
++.B \-H
++Use heuristics to speed handling of large files that have numerous
++scattered small changes.
++.TP
++.BI \-\-horizon\-lines= lines
++Do not discard the last
++.I lines
++lines of the common prefix
++and the first
++.I lines
++lines of the common suffix.
++.TP
++.B \-i
++Ignore changes in case; consider upper- and lower-case letters
++equivalent.
++.TP
++.BI "\-I " regexp
++Ignore changes that just insert or delete lines that match
++.IR regexp .
++.TP
++.BI \-\-ifdef= name
++Make merged if-then-else format output, conditional on the preprocessor
++macro
++.IR name .
++.TP
++.B \-\-ignore\-all\-space
++Ignore white space when comparing lines.
++.TP
++.B \-\-ignore\-blank\-lines
++Ignore changes that just insert or delete blank lines.
++.TP
++.B \-\-ignore\-case
++Ignore changes in case; consider upper- and lower-case to be the same.
++.TP
++.BI \-\-ignore\-matching\-lines= regexp
++Ignore changes that just insert or delete lines that match
++.IR regexp .
++.TP
++.B \-\-ignore\-space\-change
++Ignore changes in amount of white space.
++.TP
++.B \-\-initial\-tab
++Output a tab rather than a space before the text of a line in normal or
++context format. This causes the alignment of tabs in the line to look
++normal.
++.TP
++.B \-l
++Pass the output through
++.I pr
++to paginate it.
++.TP
++.BI "\-L " label
++.br
++.ns
++.TP
++.BI \-\-label= label
++Use
++.I label
++instead of the file name in the context format
++and unified format
++headers.
++.TP
++.B \-\-left\-column
++Print only the left column of two common lines in side by side format.
++.TP
++.BI \-\-line\-format= format
++Use
++.I format
++to output all input lines in in-then-else format.
++.TP
++.B \-\-minimal
++Change the algorithm to perhaps find a smaller set of changes. This
++makes
++.I diff
++slower (sometimes much slower).
++.TP
++.B \-n
++Output RCS-format diffs; like
++.B \-f
++except that each command
++specifies the number of lines affected.
++.TP
++.B \-N
++.br
++.ns
++.TP
++.B \-\-new\-file
++In directory comparison, if a file is found in only one directory,
++treat it as present but empty in the other directory.
++.TP
++.BI \-\-new\-group\-format= format
++Use
++.I format
++to output a group of lines taken from just the second
++file in if-then-else format.
++.TP
++.BI \-\-new\-line\-format= format
++Use
++.I format
++to output a line taken from just the second file in
++if-then-else format.
++.TP
++.BI \-\-old\-group\-format= format
++Use
++.I format
++to output a group of lines taken from just the first
++file in if-then-else format.
++.TP
++.BI \-\-old\-line\-format= format
++Use
++.I format
++to output a line taken from just the first file in
++if-then-else format.
++.TP
++.B \-p
++Show which C function each change is in.
++.TP
++.B \-P
++When comparing directories, if a file appears only in the second
++directory of the two, treat it as present but empty in the other.
++.TP
++.B \-\-paginate
++Pass the output through
++.I pr
++to paginate it.
++.TP
++.B \-q
++Report only whether the files differ, not the details of the
++differences.
++.TP
++.B \-r
++When comparing directories, recursively compare any subdirectories
++found.
++.TP
++.B \-\-rcs
++Output RCS-format diffs; like
++.B \-f
++except that each command
++specifies the number of lines affected.
++.TP
++.B \-\-recursive
++When comparing directories, recursively compare any subdirectories
++found.
++.TP
++.B \-\-report\-identical\-files
++.br
++.ns
++.TP
++.B \-s
++Report when two files are the same.
++.TP
++.BI "\-S " file
++When comparing directories, start with the file
++.IR file .
++This is
++used for resuming an aborted comparison.
++.TP
++.B \-\-sdiff\-merge\-assist
++Print extra information to help
++.IR sdiff .
++.I sdiff
++uses this
++option when it runs
++.IR diff .
++This option is not intended for users
++to use directly.
++.TP
++.B \-\-show\-c\-function
++Show which C function each change is in.
++.TP
++.BI \-\-show\-function\-line= regexp
++In context and unified format, for each hunk of differences, show some
++of the last preceding line that matches
++.IR regexp .
++.TP
++.B \-\-side\-by\-side
++Use the side by side output format.
++.TP
++.B \-\-speed\-large\-files
++Use heuristics to speed handling of large files that have numerous
++scattered small changes.
++.TP
++.BI \-\-starting\-file= file
++When comparing directories, start with the file
++.IR file .
++This is
++used for resuming an aborted comparison.
++.TP
++.B \-\-suppress\-common\-lines
++Do not print common lines in side by side format.
++.TP
++.B \-t
++Expand tabs to spaces in the output, to preserve the alignment of tabs
++in the input files.
++.TP
++.B \-T
++Output a tab rather than a space before the text of a line in normal or
++context format. This causes the alignment of tabs in the line to look
++normal.
++.TP
++.B \-\-text
++Treat all files as text and compare them line-by-line, even if they
++do not appear to be text.
++.TP
++.B \-u
++Use the unified output format.
++.TP
++.BI \-\-unchanged\-group\-format= format
++Use
++.I format
++to output a group of common lines taken from both files
++in if-then-else format.
++.TP
++.BI \-\-unchanged\-line\-format= format
++Use
++.I format
++to output a line common to both files in if-then-else
++format.
++.TP
++.B \-\-unidirectional\-new\-file
++When comparing directories, if a file appears only in the second
++directory of the two, treat it as present but empty in the other.
++.TP
++.BI "\-U " lines
++.br
++.ns
++.TP
++.BI \-\-unified[= lines ]
++Use the unified output format, showing
++.I lines
++(an integer) lines of
++context, or three if
++.I lines
++is not given.
++For proper operation,
++.I patch
++typically needs at least two lines of
++context.
++.TP
++.B \-v
++.br
++.ns
++.TP
++.B \-\-version
++Output the version number of
++.IR diff .
++.TP
++.B \-w
++Ignore white space when comparing lines.
++.TP
++.BI "\-W " columns
++.br
++.ns
++.TP
++.BI \-\-width= columns
++Use an output width of
++.I columns
++in side by side format.
++.TP
++.BI "\-x " pattern
++When comparing directories, ignore files and subdirectories whose basenames
++match
++.IR pattern .
++.TP
++.BI "\-X " file
++When comparing directories, ignore files and subdirectories whose basenames
++match any pattern contained in
++.IR file .
++.TP
++.B \-y
++Use the side by side output format.
++.SH SEE ALSO
++cmp(1), comm(1), diff3(1), ed(1), patch(1), pr(1), sdiff(1).
++.SH DIAGNOSTICS
++An exit status of 0 means no differences were found, 1 means some
++differences were found, and 2 means trouble.
+diff -Nru diffutils-2.7/man/diff3.1 diffutils-2.7.new/man/diff3.1
+--- diffutils-2.7/man/diff3.1 Thu Jan 1 01:00:00 1970
++++ diffutils-2.7.new/man/diff3.1 Sun Mar 21 14:45:00 1999
+@@ -0,0 +1,210 @@
++.TH DIFF3 1 "22sep1993" "GNU Tools" "GNU Tools"
++.SH NAME
++diff3 \- find differences between three files
++.SH SYNOPSIS
++.B diff3
++[options] mine older yours
++.SH DESCRIPTION
++The
++.I diff3
++command compares three files and outputs descriptions
++of their differences.
++
++The files to compare are
++.IR mine ,
++.IR older ,
++and
++.IR yours .
++At most one of these three file names may be
++.BR \- ,
++which tells
++.I diff3
++to read the standard input for that file.
++.SS Options
++Below is a summary of all of the options that GNU
++.I diff3
++accepts. Multiple single letter options (unless they take an argument)
++can be combined into a single command line argument.
++.TP
++.B \-a
++Treat all files as text and compare them line-by-line, even if they
++do not appear to be text.
++.TP
++.B \-A
++Incorporate all changes from
++.I older
++to
++.I yours
++into
++.IR mine ,
++surrounding all conflicts with bracket lines.
++.TP
++.B \-B
++Old behavior of -A. Shows non-conflicts.
++.TP
++.B \-e
++Generate an
++.I ed
++script that incorporates all the changes from
++.I older
++to
++.I yours
++into
++.IR mine .
++.TP
++.B \-E
++Like
++.BR \-e ,
++except bracket lines from overlapping changes' first
++and third files.
++With
++.BR \-e ,
++an overlapping change looks like this:
++.sp
++.nf
++<<<<<<< \fImine\fP
++lines from \fImine\fP
++=======
++lines from \fIyours\fP
++>>>>>>> \fIyours\fP
++.fi
++.TP
++.B \-\-ed
++Generate an
++.I ed
++script that incorporates all the changes from
++.I older
++to
++.I yours
++into
++.IR mine .
++.TP
++.B \-\-easy\-only
++Like
++.BR \-e ,
++except output only the nonoverlapping changes.
++.TP
++.B \-i
++Generate
++.B w
++and
++.B q
++commands at the end of the
++.I ed
++script for System V compatibility. This option must be combined with
++one of the
++.B \-AeExX3
++options, and may not be combined with
++.BR \-m .
++.TP
++.B \-\-initial\-tab
++Output a tab rather than two spaces before the text of a line in normal format.
++This causes the alignment of tabs in the line to look normal.
++.TP
++.BI "\-L " label
++.ns
++.TP
++.BI \-\-label= label
++Use the label
++.I label
++for the brackets output by the
++.BR \-A ,
++.B \-E
++and
++.B \-X
++options. This option may be given up to three
++times, one for each input file. The default labels are the names of
++the input files. Thus
++.B "diff3 \-L X \-L Y \-L Z \-m A B C"
++acts like
++.BR "diff3 \-m A B C ,
++except that the output looks like it came from
++files named
++.BR X ,
++.B Y
++and
++.B Z
++rather than from files
++named
++.BR A ,
++.B B
++and
++.BR C .
++.TP
++.B \-m
++.br
++.ns
++.TP
++.B \-\-merge
++Apply the edit script to the first file and send the result to standard
++output. Unlike piping the output from
++.I diff3
++to
++.IR ed ,
++this
++works even for binary files and incomplete lines.
++.B \-A
++is assumed
++if no edit script option is specified.
++.TP
++.B \-\-overlap\-only
++Like
++.BR \-e ,
++except output only the overlapping changes.
++.TP
++.B \-\-show\-all
++Incorporate all unmerged changes from
++.I older
++to
++.I yours
++into
++.IR mine ,
++surrounding all overlapping changes with bracket lines.
++.TP
++.B \-\-show\-overlap
++Like
++.BR \-e ,
++except bracket lines from overlapping changes' first
++and third files.
++.TP
++.B \-T
++Output a tab rather than two spaces before the text of a line in normal format.
++This causes the alignment of tabs in the line to look normal.
++.TP
++.B \-\-text
++Treat all files as text and compare them line-by-line, even if they
++do not appear to be text.
++.TP
++.B \-v
++.br
++.ns
++.TP
++.B \-\-version
++Output the version number of
++.IR diff3 .
++.TP
++.B \-x
++Like
++.BR \-e ,
++except output only the overlapping changes.
++.TP
++.B \-X
++Like
++.BR \-E ,
++except output only the overlapping changes.
++In other words, like
++.BR \-x ,
++except bracket changes as in
++.BR \-E .
++.TP
++.B \-3
++Like
++.BR \-e ,
++except output only the nonoverlapping changes.
++.SH SEE ALSO
++cmp(1), comm(1), diff(1), ed(1), patch(1), sdiff(1).
++.SH DIAGNOSTICS
++An exit status of 0 means
++.I diff3
++was successful, 1 means some
++conflicts were found, and 2 means trouble.
+diff -Nru diffutils-2.7/man/pl/diff.1 diffutils-2.7.new/man/pl/diff.1
+--- diffutils-2.7/man/pl/diff.1 Thu Jan 1 01:00:00 1970
++++ diffutils-2.7.new/man/pl/diff.1 Thu Feb 4 13:44:25 1999
+@@ -0,0 +1,348 @@
++.\" {PTM/AB/0.1/21-12-1998/""}
++.\" translated by Adam Byrtek <alpha@irc.pl>
++.\" ------------
++.\" Date: Fri, 11 Sep 1998 19:13:45 +0100
++.\" From: Edward Betts <edward@hairnet.demon.co.uk>
++.\"
++.\" Derived from the GNU diff info page.
++.\" May be distributed under the GPL.
++.\" ------------
++.TH DIFF 1 "22 Wrzesieñ 1993" "Narzêdzia GNU" "Narzêdzia GNU"
++.SH NAZWA
++diff \- szukanie ró¿nic pomiêdzy dwoma plikami
++.SH SK£ADNIA
++.B diff
++[options] from-file to-file
++.SH OPIS
++W najprostszym przypadku \fBdiff\fP porównuje zawarto¶æ dwóch plików,
++\fIfrom-file\fP i \fIto-file\fP. Nazwa pliku \fB\-\fP oznacza tekst
++odczytywany ze standardowego wej¶cia. W specjalnym przypadku \fB"diff \-
++\-"\fP porównuje kopiê standardowego wyj¶cia ze samym sob±.
++.PP
++Je¶li \fIfrom-file\fP jest katalogiem a \fIto-file\fP nie, \fBdiff\fP
++porównuje plik z katalogu \fIfrom-file\fP którego nazwa jest taka sama, jak
++\fIto-file\fP, i odwrotnie. Plik nie bêd±cy katalogiem nie mo¿e byæ \fB\-\fP.
++.PP
++Je¶li zarówno \fIfrom-file\fP jak i \fIto-file\fP s± katalogami, \fBdiff\fP
++porównuje odpowiednie pliki w obu katalogach, w kolejno¶ci alfabetycznej. To
++porównanie nie jest rekursywne, chyba ¿e podano opcjê \-r lub \-recursive.
++\fBdiff\fP nigdy nie porównuje zawarto¶ci katalogu tak, jakby by³ on
++plikiem. Podany plik nie mo¿e byæ standardowym wej¶ciem, poniewa¿ standardowe
++wej¶cie nie ma nazwy i nie dotyczy go zapis `plik o tej samej nazwie'.
++.PP
++Opcje \fBdiff\fP na ogó³ zaczynaj± siê od \-, wiêc zwykle nazwy plików
++\fIfrom-file\fP oraz \fIto-file\fP nie mog± zaczynaæ siê od \-, jednak
++argument \-\- traktuje pozosta³e argumety jako nazwy plików, nawet je¶li
++zaczynaj± siê one od \-.
++.SS Opcje
++Poni¿ej znajduje siê podsumowanie wszystkich opcji akceptowanych przez GNU
++\fBdiff\fP. Wiêkszo¶c opcji posiada dwie równowa¿ne formy, jedn± z nich jest
++pojedyncza litera poprzedzona przez \-, a drug± pe³na nazwa poprzedzona
++przez \-\-. Wiele pojedynczych liter opcji (nie wymagaj±cych argumentu) mo¿e
++byæ ³±czonych w poledynczym s³owie: \-ac jest równowa¿ne z \-a \-c. Opcje w
++formie pe³nej nazwy mog± byæ skracane do dowolnego unikalnego przedrostka.
++Klamry ( [ i ] ) oznaczaj±, ¿e opcja pobiera opcjonaly argument.
++.TP
++.BI \- lines
++Wy¶wietlenie ilo¶ci linii kontekstu podanej w \fIlines\fP (warto¶æ
++ca³kowita). Ta opcja nie ustala wyj¶ciowego formatu, nie ma ona efektu je¶li
++nie podano opcji \-c lub \-u. Ta opcja jest przestarza³a. Do prawid³owego
++dzia³ania \fBpatch\fP potrzebuje conajmniej dwóch linii kontekstu.
++.B \-a
++Traktowanie wszystkich plików jako pliki tekstowe i porównywanie ich linia
++po linii, nawet je¶li nie wygl±daj± one na pliki tekstowe.
++.TP
++.B \-b
++Ignorowanie zmian w ilo¶ci odstêpów.
++.TP
++.B \-B
++Ignorowanie zmian, które jedynie dodaj± lub usuwaj± puste linie.
++.TP
++.B \-\-brief
++Poinformowanie jedynie o tym, czy pliki siê ró¿ni±, bez podawania szczegó³ów
++na temat ró¿nic.
++.TP
++.B \-c
++U¿ycie kontekstowego formatu wyj¶ciowego.
++.TP
++.BI "\-C " lines
++.br
++.ns
++.TP
++.BI \-\-context[= lines ]
++U¿ycie kontekstowego formatu wyj¶ciowego i pokazanie ilo¶ci linii kontekstu
++podanej w \fIlines\fP (warto¶æ ca³kowita), lub trzy je¶li nie podano
++\fIlines\fP. Do prawid³owego dzia³ania \fBpatch\fP potrzebuje conajmniej
++dwóch linii kontekstu.
++.TP
++.BI \-\-changed\-group\-format= format
++U¿ycie formatu wyj¶ciowego \fIformat\fP do wy¶wietlania grupy linii
++zawieraj±cych ró¿ni±ce siê linie z obu plików w formacie if\-then\-else.
++.TP
++.B \-d
++Zmiana algorytmu na taki, który mo¿e czasami znale¼æ wiêksz± liczbê zmian.
++Spowalnia to dzia³ania \fBdiff\fP (czasami bardzo znacznie).
++.TP
++.BI "\-D " name
++Stworzenie po³±czonego formatu wyj¶cia if-then-else, w zale¿no¶ci od makra
++preprocesora \fIname\fP.
++.TP
++.B \-e
++.br
++.ns
++.TP
++.B \-\-ed
++Stworzenie wyj¶cia, które jest poprawnym skryptem \fPed\fP.
++.TP
++.BI \-\-exclude= pattern
++Ignorowanie plików i podkatalogów, których nazwy pasuj± do wzorca
++\fIpattern\fP podczas porównywania katalogów.
++.TP
++.BI \-\-exclude\-from= file
++Ignorowanie plików i podkatalogów, których nazwy pasuj± do ka¿dego wzorca
++zawartego w pliku \fIfile\fP podczas porównywania katalogów.
++.TP
++.B \-\-expand\-tabs
++Rozszerzanie tabulatorów do spacji na wyj¶ciu, aby zachowaæ oryginalne
++u³o¿enie tabulatorów pliku wej¶ciowego.
++.TP
++.B \-f
++Stworzenie wyj¶cia, które wygl±da prawie tak jak skrypt \fBed\fP, ale
++zawiera modyfikacje w kolejno¶ci pojawiania siê zmian w pliku.
++.TP
++.BI "\-F " regexp
++Pokazanie ostatniej poprzedzaj±cej linii, która pasuje do \fIregexp\fP dla
++ka¿dego ró¿ni±cego siê fragmentu w formacie kontekstowym i zunifikowanym.
++.TP
++.B \-\-forward\-ed
++Stworzenie wyj¶cia, które wygl±da prawie tak jak skrypt \fBed\fP, ale
++zawiera modyfikacje w kolejno¶ci pojawiania siê zmian w pliku.
++.TP
++.B \-h
++Ta opcja aktualnie nie ma ¿adnego efekty, ale istnieje dla kompatybilno¶ci z
++systemem Unix.
++.TP
++.B \-H
++U¿ycie algorytmów heurystycznych aby przyspieszyæ przeszukiwanie du¿ych
++plików ze znaczn± liczb± rozrzuconych ma³ych zmian.
++.TP
++.BI \-\-horizon\-lines= lines
++Nie ignorowanie ostatnich \fIlines\fP linii wspólnego przedrostka oraz
++pierwszych \fIlines\fP linii wspólnego przyrostka.
++.TP
++.B \-i
++Ignorowanie zmian w wielko¶ci liter, du¿e i ma³e litery s± uznawane za
++równowa¿ne.
++.TP
++.BI "\-I " regexp
++Ignorowanie zmian, które jedynie dodaj± lub usuwaj± linie pasuj±ce do
++\fIregexp\fP.
++.TP
++.BI \-\-ifdef= name
++Stworzenie wyj¶cia w po³±czonym formacie if\-then\-else, zale¿nie od makra
++preprocesora \fIname\fP.
++.TP
++.B \-\-ignore\-all\-space
++Ignorowanie wszystkich odstêpów przy porównywaniu plików.
++.TP
++.B \-\-ignore\-blank\-lines
++Ignorowanie zmian, które jedynie dodaj± lub usuwaj± puste linie.
++.TP
++.B \-\-ignore\-case
++Ignorowanie zmian w wielko¶ci liter, du¿e i ma³e litery s± uznawane za
++równowa¿ne.
++.TP
++.BI \-\-ignore\-matching\-lines= regexp
++Ignorowanie zmian, które jedynie dodaj± lub usuwaj± linie pasuj±ce do
++\fIregexp\fP.
++.TP
++.B \-\-ignore\-space\-change
++Ignorowanie zmian w ilo¶ci odstêpów.
++.TP
++.B \-\-initial\-tab
++Wyprowadzenie tabulatora zamiast spacji przed tekstem linii w formacie
++normalnym lub kontekstowym. Powoduje to normalny wygl±d tabulatorów w linii.
++.TP
++.B \-l
++Przes³anie wyj¶cia przez \fBpr\fP, aby podzieliæ je na strony.
++.TP
++.BI "\-L " label
++.br
++.ns
++.TP
++.BI \-\-label= label
++U¿ycie tekstu \fIlabel\fP w miejsce nazwy plikó w nag³ówku formatu
++kontekstowego i zunifikowanego.
++.TP
++.B \-\-left\-column
++Wy¶wietlenie jedynie lewej kolumy z dwóch kolum w formacie jeden obok
++drugiego.
++.TP
++.BI \-\-line\-format= format
++U¿ycie formatu \fIformat\fP aby wyprowadziæ wszystkie linie w formacie
++if\-then\-else.
++.TP
++.B \-\-minimal
++Zmiana algorytmu na taki, który mo¿e czasami znale¼æ wiêksz± liczbê zmian.
++Spowalnia to dzia³ania \fBdiff\fP (czasami bardzo znacznie).
++.TP
++.B \-n
++Wyprowadzenie ró¿nic w formacie RCS, tak jak \-f, z tym wyj±tkiem, ¿e ka¿da
++komenda wyszczególnia numer linii której dotyczy.
++.TP
++.B \-N
++.br
++.ns
++.TP
++.B \-\-new\-file
++Je¶li podczas porównywania katalogów plik istnieje jedynie w jednym z
++katalogów, bêdzie traktowany tak, jakby by³ obecny w drugim katalogu, ale
++pusty.
++.TP
++.BI \-\-new\-group\-format= format
++U¿ycie formatu \fIformat\fP do wyprowadzenia grupy linii wziêtej jedynie z
++drugiego pliku w formacie if\-then\-else.
++.TP
++.BI \-\-new\-line\-format= format
++U¿ycie formatu \fIformat\fP do wyprowadzenia linii wziêtej jedynie z drugiego
++pliku w formacie if\-then\-else.
++.TP
++.BI \-\-old\-group\-format= format
++U¿ycie formatu \fIformat\fP do wyprowadzenia grupy linii wziêtej jedynie z
++pierwszego pliku w formacie if\-then\-else.
++.TP
++.BI \-\-old\-line\-format= format
++U¿ycie formatu \fIformat\fP do wyprowadzenia linii wziêtej jedynie z
++pierwszego pliku w formacie if\-then\-else.
++.TP
++.B \-p
++Pokazanie, do jakiej funkcji C nale¿y ka¿da ze zmian.
++.TP
++.B \-P
++Je¶li podczas porównywania katalogów plik istnieje jedynie w drugim katalogu,
++bêdzie traktowany tak, jakby by³ obecny w pierwszym katalogu, ale pusty.
++.TP
++.B \-\-paginate
++Przes³anie wyj¶cia przez \fBpr\fP, aby podzieliæ je na strony.
++.TP
++.B \-q
++Poinformowanie jedynie o tym, czy pliki siê ró¿ni±, bez podawania szczegó³ów
++na temat ró¿nic.
++.TP
++.B \-r
++Rekursywne porównanie wszystkich podkatalogów, je¶li porównywane s± katalogi.
++.TP
++.B \-\-rcs
++Wyprowadzenie ró¿nic w formacie RCS, tak jak \-f, z tym wyj±tkiem, ¿e ka¿da
++komenda wyszczególnia numer linii której dotyczy.
++.TP
++.B \-\-recursive
++Rekursywne porównanie wszystkich podkatalogów, je¶li porównywane s± katalogi.
++.TP
++.B \-\-report\-identical\-files
++.br
++.ns
++.TP
++.B \-s
++Poinformowanie, je¶li oba pliki s± identyczne.
++.TP
++.BI "\-S " file
++Podczas porównywania katalogów rozpoczêcie od pliku \fIfile\fP. Opcja ta
++jest u¿yteczna podczas wznawiania przerwanego porównania.
++.TP
++.B \-\-sdiff\-merge\-assist
++Wy¶wietlenie dodatkowych informacji pomocnych dla \fBsdiff\fP. \fBsdiff\fP
++korzysta z tej opcji gdy uruchamia \fBdiff\fP. U¿ytkownicy nie powinni
++korzystaæ z tej opcji dezpo¶rednio.
++.TP
++.B \-\-show\-c\-function
++Pokazanie, do jakiej funkcji C nale¿y ka¿da ze zmian.
++.TP
++.BI \-\-show\-function\-line= regexp
++Pokazanie ostatniej poprzedzaj±cej linii, która pasuje do \fIregexp\fP dla
++ka¿dego ró¿ni±cego siê fragmentu w formacie kontekstowym i zunifikowanym.
++.IR regexp .
++.TP
++.B \-\-side\-by\-side
++U¿ycie formatu wyj¶ciowego jedno obok drugiego.
++.TP
++.B \-\-speed\-large\-files
++U¿ycie algorytmów heurystycznych aby przyspieszyæ przeszukiwanie du¿ych
++plików ze znaczn± liczb± rozrzuconych ma³ych zmian.
++.TP
++.BI \-\-starting\-file= file
++Podczas porównywania katalogów rozpoczêcie od pliku \fIfile\fP. Opcja ta
++jest u¿yteczna podczas wznawiania przerwanego porównania.
++.TP
++.B \-\-suppress\-common\-lines
++Nie wy¶wietlanie wspólnych linii w formacie jeden obok drugiego.
++.TP
++.B \-t
++Rozszerzanie tabulatorów do spacji na wyj¶ciu, aby zachowaæ oryginalne
++u³o¿enie tabulatorów pliku wej¶ciowego.
++.TP
++.B \-T
++Wyprowadzenie tabulatora zamiast spacji przed tekstem linii w formacie
++normalnym lub kontekstowym. Powoduje to normalny wygl±d tabulatorów w linii.
++.TP
++.B \-\-text
++Traktowanie wszystkich plików jako pliki tekstowe i porównywanie ich linia
++po linii, nawet je¶li nie wygl±daj± one na pliki tekstowe.
++.TP
++.B \-u
++U¿ycie zunifikowanego formatu wyj¶ciowego.
++.TP
++.BI \-\-unchanged\-group\-format= format
++U¿ycie formatu \fIformat\fP do wyprowadzenia wspólnej grupy linii wziêtej z
++obu plików w formacie if\-then\-else.
++.TP
++.BI \-\-unchanged\-line\-format= format
++U¿ycie formatu \fIformat\fP do wyprowadzenia wspólnej linii wziêtej z obu
++plików w formacie if\-then\-else.
++.TP
++.B \-\-unidirectional\-new\-file
++Je¶li podczas porównywania katalogów plik istnieje jedynie w drugim katalogu,
++bêdzie traktowany tak, jakby by³ obecny w pierwszym katalogu, ale pusty.
++.TP
++.BI "\-U " lines
++.br
++.ns
++.TP
++.BI \-\-unified[= lines ]
++U¿ycie kontekstowego formatu wyj¶ciowego i pokazanie ilo¶ci linii kontekstu
++podanej w \fIlines\fP (warto¶æ ca³kowita), lub trzy je¶li nie podano
++\fIlines\fP. Do prawid³owego dzia³ania \fBpatch\fP potrzebuje conajmniej
++dwóch linii kontekstu.
++.TP
++.B \-v
++.br
++.ns
++.TP
++.B \-\-version
++Wy¶wietlenie informacji o wersji \fBdiff\fP.
++.TP
++.B \-w
++Ignorowanie odstêpów podczas porównywania linii.
++.TP
++.BI "\-W " columns
++.br
++.ns
++.TP
++.BI \-\-width= columns
++U¿ycie szeroko¶ci wyj¶cia \fIcolumns\fP w formacie jeden obok drugiego.
++.TP
++.BI "\-x " pattern
++Podczas porównywania katalogów, ignorowanie plików i podkatalogów których
++nazwa pasuje do wzorca \fIpattern\fP.
++.TP
++.BI "\-X " file
++Podczas porównywania katalogów, ignorowanie plików i podkatalogów których
++nazwa pasuje do jednego z wzorców podanych w pliku \fIfile\fP.
++.TP
++.B \-y
++U¿ycie formatu wyj¶ciowego jeden obok drugiego.
++.SH PATRZ TAK¯E
++cmp(1), comm(1), diff3(1), ed(1), patch(1), pr(1), sdiff(1).
++.SH DIAGNOSTYKA
++Zwracana warto¶æ 0 oznacza ¿e nie odnaleziono ró¿nic, 1 oznacza pewne
++ró¿nica a 2 k³opoty.
+diff -Nru diffutils-2.7/man/sdiff.1 diffutils-2.7.new/man/sdiff.1
+--- diffutils-2.7/man/sdiff.1 Thu Jan 1 01:00:00 1970
++++ diffutils-2.7.new/man/sdiff.1 Sun Mar 21 14:45:00 1999
+@@ -0,0 +1,198 @@
++.TH SDIFF 1 "22sep1993" "GNU Tools" "GNU Tools"
++.SH NAME
++sdiff \- find differences between two files and merge interactively
++.SH SYNOPSIS
++.B sdiff
++.B -o
++outfile [options] from-file to-file
++.SH DESCRIPTION
++The
++.I sdiff
++command merges two files and interactively outputs the
++results to
++.IR outfile .
++
++If
++.I from-file
++is a directory and
++.I to-file
++is not,
++.I sdiff
++compares the file in
++.I from-file
++whose file name is that of
++.IR to-file ,
++and vice versa.
++.I from-file
++and
++.I to-file
++may not both be
++directories.
++
++.I sdiff
++options begin with
++.BR \- ,
++so normally
++.I from-file
++and
++.I to-file
++may not begin with
++.BR \- .
++However,
++.B \-\-
++as an
++argument by itself treats the remaining arguments as file names even if
++they begin with
++.BR \- .
++You may not use
++.B \-
++as an input file.
++
++.I sdiff
++without
++.B \-o
++(or
++.BR \-\-output )
++produces a
++side-by-side difference. This usage is obsolete; use
++.B "diff \-\-side\-by\-side"
++instead.
++.SS Options
++Below is a summary of all of the options that GNU
++.I sdiff
++accepts.
++Each option has two equivalent names, one of which is a single
++letter preceded by
++.BR \- ,
++and the other of which is a long name
++preceded by
++.BR \-\- .
++Multiple single letter options (unless they take
++an argument) can be combined into a single command line argument. Long
++named options can be abbreviated to any unique prefix of their name.
++.TP
++.B \-a
++Treat all files as text and compare them line-by-line, even if they
++do not appear to be text.
++.TP
++.B \-b
++Ignore changes in amount of white space.
++.TP
++.B \-B
++Ignore changes that just insert or delete blank lines.
++.TP
++.B \-d
++Change the algorithm to perhaps find a smaller set of changes. This
++makes
++.I sdiff
++slower (sometimes much slower).
++.TP
++.B \-H
++Use heuristics to speed handling of large files that have numerous
++scattered small changes.
++.TP
++.B \-\-expand\-tabs
++Expand tabs to spaces in the output, to preserve the alignment of tabs
++in the input files.
++.TP
++.B \-i
++Ignore changes in case; consider upper- and lower-case to be the same.
++.TP
++.BI "\-I " regexp
++Ignore changes that just insert or delete lines that match
++.IR regexp .
++.TP
++.B \-\-ignore\-all\-space
++Ignore white space when comparing lines.
++.TP
++.B \-\-ignore\-blank\-lines
++Ignore changes that just insert or delete blank lines.
++.TP
++.B \-\-ignore\-case
++Ignore changes in case; consider upper- and lower-case to be the same.
++.TP
++.BI \-\-ignore\-matching\-lines= regexp
++Ignore changes that just insert or delete lines that match
++.IR regexp .
++.TP
++.B \-\-ignore\-space\-change
++Ignore changes in amount of white space.
++.TP
++.B \-l
++.br
++.ns
++.TP
++.B \-\-left\-column
++Print only the left column of two common lines.
++.TP
++.B \-\-minimal
++Change the algorithm to perhaps find a smaller set of changes. This
++makes
++.I sdiff
++slower (sometimes much slower).
++.TP
++.BI "\-o " file
++.br
++.ns
++.TP
++.BI \-\-output= file
++Put merged output into
++.IR file .
++This option is required for merging.
++.TP
++.B \-s
++.br
++.ns
++.TP
++.B \-\-suppress\-common\-lines
++Do not print common lines.
++.TP
++.B \-\-speed\-large\-files
++Use heuristics to speed handling of large files that have numerous
++scattered small changes.
++.TP
++.B \-t
++Expand tabs to spaces in the output, to preserve the alignment of tabs
++in the input files.
++.TP
++.B \-\-text
++Treat all files as text and compare them line-by-line, even if they
++do not appear to be text.
++.TP
++.B \-v
++.br
++.ns
++.TP
++.B \-\-version
++Output the version number of
++.IR sdiff .
++.TP
++.BI "\-w " columns
++.br
++.ns
++.TP
++.BI \-\-width= columns
++Use an output width of
++.IR columns .
++Note that for historical reasons, this option is
++.B \-W
++in
++.IR diff ,
++.B \-w
++in
++.IR sdiff .
++.TP
++.B \-W
++Ignore horizontal white space when comparing lines.
++Note that for historical reasons, this option is
++.B \-w
++in
++.IR diff ,
++.B \-W
++in
++.IR sdiff .
++.SH SEE ALSO
++cmp(1), comm(1), diff(1), diff3(1).
++.SH DIAGNOSTICS
++An exit status of 0 means no differences were found, 1 means some
++differences were found, and 2 means trouble.
projects / packages / diffutils.git / commitdiff