1 diff -Nru diffutils-2.7/man/cmp.1 diffutils-2.7.new/man/cmp.1
2 --- diffutils-2.7/man/cmp.1 Thu Jan 1 01:00:00 1970
3 +++ diffutils-2.7.new/man/cmp.1 Sun Mar 21 14:45:00 1999
5 +.\" Copyright (c) 1987, 1990, 1993
6 +.\" The Regents of the University of California. All rights reserved.
8 +.\" This code is derived from software contributed to Berkeley by
9 +.\" the Institute of Electrical and Electronics Engineers, Inc.
11 +.\" Redistribution and use in source and binary forms, with or without
12 +.\" modification, are permitted provided that the following conditions
14 +.\" 1. Redistributions of source code must retain the above copyright
15 +.\" notice, this list of conditions and the following disclaimer.
16 +.\" 2. Redistributions in binary form must reproduce the above copyright
17 +.\" notice, this list of conditions and the following disclaimer in the
18 +.\" documentation and/or other materials provided with the distribution.
19 +.\" 3. All advertising materials mentioning features or use of this software
20 +.\" must display the following acknowledgement:
21 +.\" This product includes software developed by the University of
22 +.\" California, Berkeley and its contributors.
23 +.\" 4. Neither the name of the University nor the names of its contributors
24 +.\" may be used to endorse or promote products derived from this software
25 +.\" without specific prior written permission.
27 +.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
28 +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
29 +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
30 +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
31 +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
32 +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
33 +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
34 +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
35 +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
36 +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
39 +.\" @(#)cmp.1 8.1 (Berkeley) 6/6/93
46 +.Nd compare two files
51 +.Op Ar skip1 Op Ar skip2
53 +The cmp utility compares two files of any type and writes the results
54 +to the standard output.
57 +is silent if the files are the same; if they differ, the byte
58 +and line number at which the first difference occurred is reported.
60 +Bytes and lines are numbered beginning with one.
62 +The following options are available:
65 +Print the byte number (decimal) and the differing
66 +byte values (octal) for each difference.
68 +Print nothing for differing files; return exit
72 +The optional arguments
76 +are the byte offsets from the beginning of
80 +respectively, where the comparison will begin.
81 +The offset is decimal by default, but may be expressed as an hexadecimal
82 +or octal value by preceding it with a leading ``0x'' or ``0''.
86 +utility exits with one of the following values:
89 +The files are identical.
91 +The files are different; this includes the case
92 +where one file is identical to the first part of
94 +In the latter case, if the
96 +option has not been specified,
98 +writes to standard output that EOF was reached in the shorter
99 +file (before any differences were found).
109 +utility is expected to be
112 diff -Nru diffutils-2.7/man/diff.1 diffutils-2.7.new/man/diff.1
113 --- diffutils-2.7/man/diff.1 Thu Jan 1 01:00:00 1970
114 +++ diffutils-2.7.new/man/diff.1 Sun Mar 21 14:45:00 1999
116 +.TH DIFF 1 "22sep1993" "GNU Tools" "GNU Tools"
118 +diff \- find differences between two files
121 +[options] from-file to-file
123 +In the simplest case,
125 +compares the contents of the two files
132 +text read from the standard input. As a special case,
134 +compares a copy of standard input to itself.
142 +compares the file in
144 +whose file name is that of
146 +and vice versa. The non-directory file must not be
155 +compares corresponding files in both directories, in
156 +alphabetical order; this comparison is not recursive unless the
163 +compares the actual contents of a directory as if it were a file. The
164 +file that is fully specified may not be standard input, because standard
165 +input is nameless and the notion of ``file with the same name'' does not
180 +argument by itself treats the remaining arguments as file names even if
184 +Below is a summary of all of the options that GNU
187 +Most options have two equivalent names, one of which is a single letter
190 +and the other of which is a long name preceded by
192 +Multiple single letter options (unless they take an
193 +argument) can be combined into a single command line word:
198 +Long named options can be abbreviated to
199 +any unique prefix of their name. Brackets
204 +option takes an optional argument.
209 +(an integer) lines of context. This option does not
210 +specify an output format by itself; it has no effect unless it is
215 +This option is obsolete. For proper
218 +typically needs at least two lines of context.
221 +Treat all files as text and compare them line-by-line, even if they
222 +do not seem to be text.
225 +Ignore changes in amount of white space.
228 +Ignore changes that just insert or delete blank lines.
231 +Report only whether the files differ, not the details of the
235 +Use the context output format.
241 +.BI \-\-context[= lines ]
242 +Use the context output format, showing
244 +(an integer) lines of
245 +context, or three if
248 +For proper operation,
250 +typically needs at least two lines of
253 +.BI \-\-changed\-group\-format= format
256 +to output a line group containing differing lines from
257 +both files in if-then-else format.
260 +Change the algorithm to perhaps find a smaller set of changes. This makes
262 +slower (sometimes much slower).
265 +Make merged if-then-else format output, conditional on the preprocessor
274 +Make output that is a valid
278 +.BI \-\-exclude= pattern
279 +When comparing directories, ignore files and subdirectories whose basenames
283 +.BI \-\-exclude\-from= file
284 +When comparing directories, ignore files and subdirectories whose basenames
285 +match any pattern contained in
289 +Expand tabs to spaces in the output, to preserve the alignment of tabs
293 +Make output that looks vaguely like an
295 +script but has changes
296 +in the order they appear in the file.
299 +In context and unified format, for each hunk of differences, show some
300 +of the last preceding line that matches
304 +Make output that looks vaguely like an
306 +script but has changes
307 +in the order they appear in the file.
310 +This option currently has no effect; it is present for Unix
314 +Use heuristics to speed handling of large files that have numerous
315 +scattered small changes.
317 +.BI \-\-horizon\-lines= lines
318 +Do not discard the last
320 +lines of the common prefix
323 +lines of the common suffix.
326 +Ignore changes in case; consider upper- and lower-case letters
330 +Ignore changes that just insert or delete lines that match
334 +Make merged if-then-else format output, conditional on the preprocessor
338 +.B \-\-ignore\-all\-space
339 +Ignore white space when comparing lines.
341 +.B \-\-ignore\-blank\-lines
342 +Ignore changes that just insert or delete blank lines.
345 +Ignore changes in case; consider upper- and lower-case to be the same.
347 +.BI \-\-ignore\-matching\-lines= regexp
348 +Ignore changes that just insert or delete lines that match
351 +.B \-\-ignore\-space\-change
352 +Ignore changes in amount of white space.
355 +Output a tab rather than a space before the text of a line in normal or
356 +context format. This causes the alignment of tabs in the line to look
360 +Pass the output through
368 +.BI \-\-label= label
371 +instead of the file name in the context format
376 +Print only the left column of two common lines in side by side format.
378 +.BI \-\-line\-format= format
381 +to output all input lines in in-then-else format.
384 +Change the algorithm to perhaps find a smaller set of changes. This
387 +slower (sometimes much slower).
390 +Output RCS-format diffs; like
392 +except that each command
393 +specifies the number of lines affected.
400 +In directory comparison, if a file is found in only one directory,
401 +treat it as present but empty in the other directory.
403 +.BI \-\-new\-group\-format= format
406 +to output a group of lines taken from just the second
407 +file in if-then-else format.
409 +.BI \-\-new\-line\-format= format
412 +to output a line taken from just the second file in
413 +if-then-else format.
415 +.BI \-\-old\-group\-format= format
418 +to output a group of lines taken from just the first
419 +file in if-then-else format.
421 +.BI \-\-old\-line\-format= format
424 +to output a line taken from just the first file in
425 +if-then-else format.
428 +Show which C function each change is in.
431 +When comparing directories, if a file appears only in the second
432 +directory of the two, treat it as present but empty in the other.
435 +Pass the output through
440 +Report only whether the files differ, not the details of the
444 +When comparing directories, recursively compare any subdirectories
448 +Output RCS-format diffs; like
450 +except that each command
451 +specifies the number of lines affected.
454 +When comparing directories, recursively compare any subdirectories
457 +.B \-\-report\-identical\-files
462 +Report when two files are the same.
465 +When comparing directories, start with the file
468 +used for resuming an aborted comparison.
470 +.B \-\-sdiff\-merge\-assist
471 +Print extra information to help
477 +This option is not intended for users
480 +.B \-\-show\-c\-function
481 +Show which C function each change is in.
483 +.BI \-\-show\-function\-line= regexp
484 +In context and unified format, for each hunk of differences, show some
485 +of the last preceding line that matches
488 +.B \-\-side\-by\-side
489 +Use the side by side output format.
491 +.B \-\-speed\-large\-files
492 +Use heuristics to speed handling of large files that have numerous
493 +scattered small changes.
495 +.BI \-\-starting\-file= file
496 +When comparing directories, start with the file
499 +used for resuming an aborted comparison.
501 +.B \-\-suppress\-common\-lines
502 +Do not print common lines in side by side format.
505 +Expand tabs to spaces in the output, to preserve the alignment of tabs
509 +Output a tab rather than a space before the text of a line in normal or
510 +context format. This causes the alignment of tabs in the line to look
514 +Treat all files as text and compare them line-by-line, even if they
515 +do not appear to be text.
518 +Use the unified output format.
520 +.BI \-\-unchanged\-group\-format= format
523 +to output a group of common lines taken from both files
524 +in if-then-else format.
526 +.BI \-\-unchanged\-line\-format= format
529 +to output a line common to both files in if-then-else
532 +.B \-\-unidirectional\-new\-file
533 +When comparing directories, if a file appears only in the second
534 +directory of the two, treat it as present but empty in the other.
540 +.BI \-\-unified[= lines ]
541 +Use the unified output format, showing
543 +(an integer) lines of
544 +context, or three if
547 +For proper operation,
549 +typically needs at least two lines of
557 +Output the version number of
561 +Ignore white space when comparing lines.
567 +.BI \-\-width= columns
568 +Use an output width of
570 +in side by side format.
573 +When comparing directories, ignore files and subdirectories whose basenames
578 +When comparing directories, ignore files and subdirectories whose basenames
579 +match any pattern contained in
583 +Use the side by side output format.
585 +cmp(1), comm(1), diff3(1), ed(1), patch(1), pr(1), sdiff(1).
587 +An exit status of 0 means no differences were found, 1 means some
588 +differences were found, and 2 means trouble.
589 diff -Nru diffutils-2.7/man/diff3.1 diffutils-2.7.new/man/diff3.1
590 --- diffutils-2.7/man/diff3.1 Thu Jan 1 01:00:00 1970
591 +++ diffutils-2.7.new/man/diff3.1 Sun Mar 21 14:45:00 1999
593 +.TH DIFF3 1 "22sep1993" "GNU Tools" "GNU Tools"
595 +diff3 \- find differences between three files
598 +[options] mine older yours
602 +command compares three files and outputs descriptions
603 +of their differences.
605 +The files to compare are
610 +At most one of these three file names may be
614 +to read the standard input for that file.
616 +Below is a summary of all of the options that GNU
618 +accepts. Multiple single letter options (unless they take an argument)
619 +can be combined into a single command line argument.
622 +Treat all files as text and compare them line-by-line, even if they
623 +do not appear to be text.
626 +Incorporate all changes from
632 +surrounding all conflicts with bracket lines.
635 +Old behavior of -A. Shows non-conflicts.
640 +script that incorporates all the changes from
650 +except bracket lines from overlapping changes' first
654 +an overlapping change looks like this:
658 +lines from \fImine\fP
660 +lines from \fIyours\fP
667 +script that incorporates all the changes from
677 +except output only the nonoverlapping changes.
684 +commands at the end of the
686 +script for System V compatibility. This option must be combined with
689 +options, and may not be combined with
693 +Output a tab rather than two spaces before the text of a line in normal format.
694 +This causes the alignment of tabs in the line to look normal.
699 +.BI \-\-label= label
702 +for the brackets output by the
707 +options. This option may be given up to three
708 +times, one for each input file. The default labels are the names of
709 +the input files. Thus
710 +.B "diff3 \-L X \-L Y \-L Z \-m A B C"
712 +.BR "diff3 \-m A B C ,
713 +except that the output looks like it came from
719 +rather than from files
731 +Apply the edit script to the first file and send the result to standard
732 +output. Unlike piping the output from
737 +works even for binary files and incomplete lines.
740 +if no edit script option is specified.
742 +.B \-\-overlap\-only
745 +except output only the overlapping changes.
748 +Incorporate all unmerged changes from
754 +surrounding all overlapping changes with bracket lines.
756 +.B \-\-show\-overlap
759 +except bracket lines from overlapping changes' first
763 +Output a tab rather than two spaces before the text of a line in normal format.
764 +This causes the alignment of tabs in the line to look normal.
767 +Treat all files as text and compare them line-by-line, even if they
768 +do not appear to be text.
775 +Output the version number of
781 +except output only the overlapping changes.
786 +except output only the overlapping changes.
787 +In other words, like
789 +except bracket changes as in
795 +except output only the nonoverlapping changes.
797 +cmp(1), comm(1), diff(1), ed(1), patch(1), sdiff(1).
799 +An exit status of 0 means
801 +was successful, 1 means some
802 +conflicts were found, and 2 means trouble.
803 diff -Nru diffutils-2.7/man/pl/diff.1 diffutils-2.7.new/man/pl/diff.1
804 --- diffutils-2.7/man/pl/diff.1 Thu Jan 1 01:00:00 1970
805 +++ diffutils-2.7.new/man/pl/diff.1 Thu Feb 4 13:44:25 1999
807 +.\" {PTM/AB/0.1/21-12-1998/""}
808 +.\" translated by Adam Byrtek <alpha@irc.pl>
810 +.\" Date: Fri, 11 Sep 1998 19:13:45 +0100
811 +.\" From: Edward Betts <edward@hairnet.demon.co.uk>
813 +.\" Derived from the GNU diff info page.
814 +.\" May be distributed under the GPL.
816 +.TH DIFF 1 "22 Wrzesieñ 1993" "Narzêdzia GNU" "Narzêdzia GNU"
818 +diff \- szukanie ró¿nic pomiêdzy dwoma plikami
821 +[options] from-file to-file
823 +W najprostszym przypadku \fBdiff\fP porównuje zawarto¶æ dwóch plików,
824 +\fIfrom-file\fP i \fIto-file\fP. Nazwa pliku \fB\-\fP oznacza tekst
825 +odczytywany ze standardowego wej¶cia. W specjalnym przypadku \fB"diff \-
826 +\-"\fP porównuje kopiê standardowego wyj¶cia ze samym sob±.
828 +Je¶li \fIfrom-file\fP jest katalogiem a \fIto-file\fP nie, \fBdiff\fP
829 +porównuje plik z katalogu \fIfrom-file\fP którego nazwa jest taka sama, jak
830 +\fIto-file\fP, i odwrotnie. Plik nie bêd±cy katalogiem nie mo¿e byæ \fB\-\fP.
832 +Je¶li zarówno \fIfrom-file\fP jak i \fIto-file\fP s± katalogami, \fBdiff\fP
833 +porównuje odpowiednie pliki w obu katalogach, w kolejno¶ci alfabetycznej. To
834 +porównanie nie jest rekursywne, chyba ¿e podano opcjê \-r lub \-recursive.
835 +\fBdiff\fP nigdy nie porównuje zawarto¶ci katalogu tak, jakby by³ on
836 +plikiem. Podany plik nie mo¿e byæ standardowym wej¶ciem, poniewa¿ standardowe
837 +wej¶cie nie ma nazwy i nie dotyczy go zapis `plik o tej samej nazwie'.
839 +Opcje \fBdiff\fP na ogó³ zaczynaj± siê od \-, wiêc zwykle nazwy plików
840 +\fIfrom-file\fP oraz \fIto-file\fP nie mog± zaczynaæ siê od \-, jednak
841 +argument \-\- traktuje pozosta³e argumety jako nazwy plików, nawet je¶li
842 +zaczynaj± siê one od \-.
844 +Poni¿ej znajduje siê podsumowanie wszystkich opcji akceptowanych przez GNU
845 +\fBdiff\fP. Wiêkszo¶c opcji posiada dwie równowa¿ne formy, jedn± z nich jest
846 +pojedyncza litera poprzedzona przez \-, a drug± pe³na nazwa poprzedzona
847 +przez \-\-. Wiele pojedynczych liter opcji (nie wymagaj±cych argumentu) mo¿e
848 +byæ ³±czonych w poledynczym s³owie: \-ac jest równowa¿ne z \-a \-c. Opcje w
849 +formie pe³nej nazwy mog± byæ skracane do dowolnego unikalnego przedrostka.
850 +Klamry ( [ i ] ) oznaczaj±, ¿e opcja pobiera opcjonaly argument.
853 +Wy¶wietlenie ilo¶ci linii kontekstu podanej w \fIlines\fP (warto¶æ
854 +ca³kowita). Ta opcja nie ustala wyj¶ciowego formatu, nie ma ona efektu je¶li
855 +nie podano opcji \-c lub \-u. Ta opcja jest przestarza³a. Do prawid³owego
856 +dzia³ania \fBpatch\fP potrzebuje conajmniej dwóch linii kontekstu.
858 +Traktowanie wszystkich plików jako pliki tekstowe i porównywanie ich linia
859 +po linii, nawet je¶li nie wygl±daj± one na pliki tekstowe.
862 +Ignorowanie zmian w ilo¶ci odstêpów.
865 +Ignorowanie zmian, które jedynie dodaj± lub usuwaj± puste linie.
868 +Poinformowanie jedynie o tym, czy pliki siê ró¿ni±, bez podawania szczegó³ów
872 +U¿ycie kontekstowego formatu wyj¶ciowego.
878 +.BI \-\-context[= lines ]
879 +U¿ycie kontekstowego formatu wyj¶ciowego i pokazanie ilo¶ci linii kontekstu
880 +podanej w \fIlines\fP (warto¶æ ca³kowita), lub trzy je¶li nie podano
881 +\fIlines\fP. Do prawid³owego dzia³ania \fBpatch\fP potrzebuje conajmniej
882 +dwóch linii kontekstu.
884 +.BI \-\-changed\-group\-format= format
885 +U¿ycie formatu wyj¶ciowego \fIformat\fP do wy¶wietlania grupy linii
886 +zawieraj±cych ró¿ni±ce siê linie z obu plików w formacie if\-then\-else.
889 +Zmiana algorytmu na taki, który mo¿e czasami znale¼æ wiêksz± liczbê zmian.
890 +Spowalnia to dzia³ania \fBdiff\fP (czasami bardzo znacznie).
893 +Stworzenie po³±czonego formatu wyj¶cia if-then-else, w zale¿no¶ci od makra
894 +preprocesora \fIname\fP.
901 +Stworzenie wyj¶cia, które jest poprawnym skryptem \fPed\fP.
903 +.BI \-\-exclude= pattern
904 +Ignorowanie plików i podkatalogów, których nazwy pasuj± do wzorca
905 +\fIpattern\fP podczas porównywania katalogów.
907 +.BI \-\-exclude\-from= file
908 +Ignorowanie plików i podkatalogów, których nazwy pasuj± do ka¿dego wzorca
909 +zawartego w pliku \fIfile\fP podczas porównywania katalogów.
912 +Rozszerzanie tabulatorów do spacji na wyj¶ciu, aby zachowaæ oryginalne
913 +u³o¿enie tabulatorów pliku wej¶ciowego.
916 +Stworzenie wyj¶cia, które wygl±da prawie tak jak skrypt \fBed\fP, ale
917 +zawiera modyfikacje w kolejno¶ci pojawiania siê zmian w pliku.
920 +Pokazanie ostatniej poprzedzaj±cej linii, która pasuje do \fIregexp\fP dla
921 +ka¿dego ró¿ni±cego siê fragmentu w formacie kontekstowym i zunifikowanym.
924 +Stworzenie wyj¶cia, które wygl±da prawie tak jak skrypt \fBed\fP, ale
925 +zawiera modyfikacje w kolejno¶ci pojawiania siê zmian w pliku.
928 +Ta opcja aktualnie nie ma ¿adnego efekty, ale istnieje dla kompatybilno¶ci z
932 +U¿ycie algorytmów heurystycznych aby przyspieszyæ przeszukiwanie du¿ych
933 +plików ze znaczn± liczb± rozrzuconych ma³ych zmian.
935 +.BI \-\-horizon\-lines= lines
936 +Nie ignorowanie ostatnich \fIlines\fP linii wspólnego przedrostka oraz
937 +pierwszych \fIlines\fP linii wspólnego przyrostka.
940 +Ignorowanie zmian w wielko¶ci liter, du¿e i ma³e litery s± uznawane za
944 +Ignorowanie zmian, które jedynie dodaj± lub usuwaj± linie pasuj±ce do
948 +Stworzenie wyj¶cia w po³±czonym formacie if\-then\-else, zale¿nie od makra
949 +preprocesora \fIname\fP.
951 +.B \-\-ignore\-all\-space
952 +Ignorowanie wszystkich odstêpów przy porównywaniu plików.
954 +.B \-\-ignore\-blank\-lines
955 +Ignorowanie zmian, które jedynie dodaj± lub usuwaj± puste linie.
958 +Ignorowanie zmian w wielko¶ci liter, du¿e i ma³e litery s± uznawane za
961 +.BI \-\-ignore\-matching\-lines= regexp
962 +Ignorowanie zmian, które jedynie dodaj± lub usuwaj± linie pasuj±ce do
965 +.B \-\-ignore\-space\-change
966 +Ignorowanie zmian w ilo¶ci odstêpów.
969 +Wyprowadzenie tabulatora zamiast spacji przed tekstem linii w formacie
970 +normalnym lub kontekstowym. Powoduje to normalny wygl±d tabulatorów w linii.
973 +Przes³anie wyj¶cia przez \fBpr\fP, aby podzieliæ je na strony.
979 +.BI \-\-label= label
980 +U¿ycie tekstu \fIlabel\fP w miejsce nazwy plikó w nag³ówku formatu
981 +kontekstowego i zunifikowanego.
984 +Wy¶wietlenie jedynie lewej kolumy z dwóch kolum w formacie jeden obok
987 +.BI \-\-line\-format= format
988 +U¿ycie formatu \fIformat\fP aby wyprowadziæ wszystkie linie w formacie
992 +Zmiana algorytmu na taki, który mo¿e czasami znale¼æ wiêksz± liczbê zmian.
993 +Spowalnia to dzia³ania \fBdiff\fP (czasami bardzo znacznie).
996 +Wyprowadzenie ró¿nic w formacie RCS, tak jak \-f, z tym wyj±tkiem, ¿e ka¿da
997 +komenda wyszczególnia numer linii której dotyczy.
1004 +Je¶li podczas porównywania katalogów plik istnieje jedynie w jednym z
1005 +katalogów, bêdzie traktowany tak, jakby by³ obecny w drugim katalogu, ale
1008 +.BI \-\-new\-group\-format= format
1009 +U¿ycie formatu \fIformat\fP do wyprowadzenia grupy linii wziêtej jedynie z
1010 +drugiego pliku w formacie if\-then\-else.
1012 +.BI \-\-new\-line\-format= format
1013 +U¿ycie formatu \fIformat\fP do wyprowadzenia linii wziêtej jedynie z drugiego
1014 +pliku w formacie if\-then\-else.
1016 +.BI \-\-old\-group\-format= format
1017 +U¿ycie formatu \fIformat\fP do wyprowadzenia grupy linii wziêtej jedynie z
1018 +pierwszego pliku w formacie if\-then\-else.
1020 +.BI \-\-old\-line\-format= format
1021 +U¿ycie formatu \fIformat\fP do wyprowadzenia linii wziêtej jedynie z
1022 +pierwszego pliku w formacie if\-then\-else.
1025 +Pokazanie, do jakiej funkcji C nale¿y ka¿da ze zmian.
1028 +Je¶li podczas porównywania katalogów plik istnieje jedynie w drugim katalogu,
1029 +bêdzie traktowany tak, jakby by³ obecny w pierwszym katalogu, ale pusty.
1032 +Przes³anie wyj¶cia przez \fBpr\fP, aby podzieliæ je na strony.
1035 +Poinformowanie jedynie o tym, czy pliki siê ró¿ni±, bez podawania szczegó³ów
1039 +Rekursywne porównanie wszystkich podkatalogów, je¶li porównywane s± katalogi.
1042 +Wyprowadzenie ró¿nic w formacie RCS, tak jak \-f, z tym wyj±tkiem, ¿e ka¿da
1043 +komenda wyszczególnia numer linii której dotyczy.
1046 +Rekursywne porównanie wszystkich podkatalogów, je¶li porównywane s± katalogi.
1048 +.B \-\-report\-identical\-files
1053 +Poinformowanie, je¶li oba pliki s± identyczne.
1056 +Podczas porównywania katalogów rozpoczêcie od pliku \fIfile\fP. Opcja ta
1057 +jest u¿yteczna podczas wznawiania przerwanego porównania.
1059 +.B \-\-sdiff\-merge\-assist
1060 +Wy¶wietlenie dodatkowych informacji pomocnych dla \fBsdiff\fP. \fBsdiff\fP
1061 +korzysta z tej opcji gdy uruchamia \fBdiff\fP. U¿ytkownicy nie powinni
1062 +korzystaæ z tej opcji dezpo¶rednio.
1064 +.B \-\-show\-c\-function
1065 +Pokazanie, do jakiej funkcji C nale¿y ka¿da ze zmian.
1067 +.BI \-\-show\-function\-line= regexp
1068 +Pokazanie ostatniej poprzedzaj±cej linii, która pasuje do \fIregexp\fP dla
1069 +ka¿dego ró¿ni±cego siê fragmentu w formacie kontekstowym i zunifikowanym.
1072 +.B \-\-side\-by\-side
1073 +U¿ycie formatu wyj¶ciowego jedno obok drugiego.
1075 +.B \-\-speed\-large\-files
1076 +U¿ycie algorytmów heurystycznych aby przyspieszyæ przeszukiwanie du¿ych
1077 +plików ze znaczn± liczb± rozrzuconych ma³ych zmian.
1079 +.BI \-\-starting\-file= file
1080 +Podczas porównywania katalogów rozpoczêcie od pliku \fIfile\fP. Opcja ta
1081 +jest u¿yteczna podczas wznawiania przerwanego porównania.
1083 +.B \-\-suppress\-common\-lines
1084 +Nie wy¶wietlanie wspólnych linii w formacie jeden obok drugiego.
1087 +Rozszerzanie tabulatorów do spacji na wyj¶ciu, aby zachowaæ oryginalne
1088 +u³o¿enie tabulatorów pliku wej¶ciowego.
1091 +Wyprowadzenie tabulatora zamiast spacji przed tekstem linii w formacie
1092 +normalnym lub kontekstowym. Powoduje to normalny wygl±d tabulatorów w linii.
1095 +Traktowanie wszystkich plików jako pliki tekstowe i porównywanie ich linia
1096 +po linii, nawet je¶li nie wygl±daj± one na pliki tekstowe.
1099 +U¿ycie zunifikowanego formatu wyj¶ciowego.
1101 +.BI \-\-unchanged\-group\-format= format
1102 +U¿ycie formatu \fIformat\fP do wyprowadzenia wspólnej grupy linii wziêtej z
1103 +obu plików w formacie if\-then\-else.
1105 +.BI \-\-unchanged\-line\-format= format
1106 +U¿ycie formatu \fIformat\fP do wyprowadzenia wspólnej linii wziêtej z obu
1107 +plików w formacie if\-then\-else.
1109 +.B \-\-unidirectional\-new\-file
1110 +Je¶li podczas porównywania katalogów plik istnieje jedynie w drugim katalogu,
1111 +bêdzie traktowany tak, jakby by³ obecny w pierwszym katalogu, ale pusty.
1117 +.BI \-\-unified[= lines ]
1118 +U¿ycie kontekstowego formatu wyj¶ciowego i pokazanie ilo¶ci linii kontekstu
1119 +podanej w \fIlines\fP (warto¶æ ca³kowita), lub trzy je¶li nie podano
1120 +\fIlines\fP. Do prawid³owego dzia³ania \fBpatch\fP potrzebuje conajmniej
1121 +dwóch linii kontekstu.
1128 +Wy¶wietlenie informacji o wersji \fBdiff\fP.
1131 +Ignorowanie odstêpów podczas porównywania linii.
1137 +.BI \-\-width= columns
1138 +U¿ycie szeroko¶ci wyj¶cia \fIcolumns\fP w formacie jeden obok drugiego.
1141 +Podczas porównywania katalogów, ignorowanie plików i podkatalogów których
1142 +nazwa pasuje do wzorca \fIpattern\fP.
1145 +Podczas porównywania katalogów, ignorowanie plików i podkatalogów których
1146 +nazwa pasuje do jednego z wzorców podanych w pliku \fIfile\fP.
1149 +U¿ycie formatu wyj¶ciowego jeden obok drugiego.
1151 +cmp(1), comm(1), diff3(1), ed(1), patch(1), pr(1), sdiff(1).
1153 +Zwracana warto¶æ 0 oznacza ¿e nie odnaleziono ró¿nic, 1 oznacza pewne
1154 +ró¿nica a 2 k³opoty.
1155 diff -Nru diffutils-2.7/man/sdiff.1 diffutils-2.7.new/man/sdiff.1
1156 --- diffutils-2.7/man/sdiff.1 Thu Jan 1 01:00:00 1970
1157 +++ diffutils-2.7.new/man/sdiff.1 Sun Mar 21 14:45:00 1999
1159 +.TH SDIFF 1 "22sep1993" "GNU Tools" "GNU Tools"
1161 +sdiff \- find differences between two files and merge interactively
1165 +outfile [options] from-file to-file
1169 +command merges two files and interactively outputs the
1179 +compares the file in
1181 +whose file name is that of
1202 +argument by itself treats the remaining arguments as file names even if
1215 +side-by-side difference. This usage is obsolete; use
1216 +.B "diff \-\-side\-by\-side"
1219 +Below is a summary of all of the options that GNU
1222 +Each option has two equivalent names, one of which is a single
1225 +and the other of which is a long name
1228 +Multiple single letter options (unless they take
1229 +an argument) can be combined into a single command line argument. Long
1230 +named options can be abbreviated to any unique prefix of their name.
1233 +Treat all files as text and compare them line-by-line, even if they
1234 +do not appear to be text.
1237 +Ignore changes in amount of white space.
1240 +Ignore changes that just insert or delete blank lines.
1243 +Change the algorithm to perhaps find a smaller set of changes. This
1246 +slower (sometimes much slower).
1249 +Use heuristics to speed handling of large files that have numerous
1250 +scattered small changes.
1252 +.B \-\-expand\-tabs
1253 +Expand tabs to spaces in the output, to preserve the alignment of tabs
1254 +in the input files.
1257 +Ignore changes in case; consider upper- and lower-case to be the same.
1260 +Ignore changes that just insert or delete lines that match
1263 +.B \-\-ignore\-all\-space
1264 +Ignore white space when comparing lines.
1266 +.B \-\-ignore\-blank\-lines
1267 +Ignore changes that just insert or delete blank lines.
1269 +.B \-\-ignore\-case
1270 +Ignore changes in case; consider upper- and lower-case to be the same.
1272 +.BI \-\-ignore\-matching\-lines= regexp
1273 +Ignore changes that just insert or delete lines that match
1276 +.B \-\-ignore\-space\-change
1277 +Ignore changes in amount of white space.
1283 +.B \-\-left\-column
1284 +Print only the left column of two common lines.
1287 +Change the algorithm to perhaps find a smaller set of changes. This
1290 +slower (sometimes much slower).
1296 +.BI \-\-output= file
1297 +Put merged output into
1299 +This option is required for merging.
1305 +.B \-\-suppress\-common\-lines
1306 +Do not print common lines.
1308 +.B \-\-speed\-large\-files
1309 +Use heuristics to speed handling of large files that have numerous
1310 +scattered small changes.
1313 +Expand tabs to spaces in the output, to preserve the alignment of tabs
1314 +in the input files.
1317 +Treat all files as text and compare them line-by-line, even if they
1318 +do not appear to be text.
1325 +Output the version number of
1332 +.BI \-\-width= columns
1333 +Use an output width of
1335 +Note that for historical reasons, this option is
1344 +Ignore horizontal white space when comparing lines.
1345 +Note that for historical reasons, this option is
1353 +cmp(1), comm(1), diff(1), diff3(1).
1355 +An exit status of 0 means no differences were found, 1 means some
1356 +differences were found, and 2 means trouble.
projects / packages / diffutils.git / blob