-
Notifications
You must be signed in to change notification settings - Fork 1
Expand file tree
/
Copy pathdiffutils-info.patch
More file actions
135 lines (118 loc) · 5.6 KB
/
Copy pathdiffutils-info.patch
File metadata and controls
135 lines (118 loc) · 5.6 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
--- diffutils-3.11/doc/diffutils.texi.orig 2025-01-12 19:27:47.000000000 +0100
+++ diffutils-3.11/doc/diffutils.texi 2025-02-08 10:19:04.450891073 +0100
@@ -32,18 +32,14 @@ A copy of the license is included in the
@c Debian install-info (up through at least version 1.9.20) uses only the
@c first dircategory. Put this one first, as it is more useful in practice.
-@dircategory Individual utilities
+@dircategory File utilities:
@direntry
-* cmp: (diffutils)Invoking cmp. Compare 2 files byte by byte.
-* diff: (diffutils)Invoking diff. Compare 2 files line by line.
-* diff3: (diffutils)Invoking diff3. Compare 3 files line by line.
-* patch: (diffutils)Invoking patch. Apply a patch to a file.
-* sdiff: (diffutils)Invoking sdiff. Merge 2 files side-by-side.
-@end direntry
-
-@dircategory Text creation and manipulation
-@direntry
-* Diffutils: (diffutils). Comparing and merging files.
+* cmp: (diffutils)cmp. Compare 2 files byte by byte
+* diff: (diffutils)diff. Compare 2 files line by line
+* diff3: (diffutils)diff3. Compare 3 files line by line
+* patch: (diffutils)patch. Apply a patch to a file
+* sdiff: (diffutils)sdiff. Merge 2 files side-by-side
+* Diffutils: (diffutils). Comparing and merging files
@end direntry
@titlepage
@@ -84,11 +80,11 @@ A copy of the license is included in the
* Merging with patch:: Using @command{patch} to change old files into new ones.
* Making Patches:: Tips for making and using patch distributions.
-* Invoking cmp:: Compare two files byte by byte.
-* Invoking diff:: Compare two files line by line.
-* Invoking diff3:: Compare three files line by line.
-* Invoking patch:: Apply a diff file to an original.
-* Invoking sdiff:: Side-by-side merge of file differences.
+* cmp:: Compare two files byte by byte.
+* diff:: Compare two files line by line.
+* diff3:: Compare three files line by line.
+* patch:: Apply a diff file to an original.
+* sdiff:: Side-by-side merge of file differences.
* Standards conformance:: Conformance to the POSIX standard.
* Projects:: If you've found a bug or other shortcoming.
@@ -452,7 +448,7 @@ file is a prefix of the other. You can
the @option{-s}, @option{--quiet}, or @option{--silent} option to
suppress that information, so that @command{cmp}
produces no output and reports whether the files differ using only its
-exit status (@pxref{Invoking cmp}).
+exit status (@pxref{cmp}).
@c Fix this.
Unlike @command{diff}, @command{cmp} cannot compare directories; it can only
@@ -520,7 +516,7 @@ If you want to compare two files byte by
option to show the values of each differing byte in the two files.
With GNU @command{cmp}, you can also use the @option{-b} or
@option{--print-bytes} option to show the ASCII representation of
-those bytes. @xref{Invoking cmp}, for more information.
+those bytes. @xref{cmp}, for more information.
If @command{diff3} thinks that any of the files it is comparing is binary
(a non-text file), it normally reports an error, because such
@@ -2074,7 +2070,7 @@ differences without surrounding context.
on whether they are two-way or three-way, and lines are annotated by
their location in the input files.
-@xref{Invoking diff3}, for more information on how to run @command{diff3}.
+@xref{diff3}, for more information on how to run @command{diff3}.
@menu
* Sample diff3 Input:: Sample @command{diff3} input for examples.
@@ -2503,7 +2499,7 @@ The @option{-i} option requires one of t
With @command{sdiff}, you can merge two files interactively based on a
side-by-side @option{-y} format comparison (@pxref{Side by Side}). Use
@option{--output=@var{file}} (@option{-o @var{file}}) to specify where to
-put the merged text. @xref{Invoking sdiff}, for more details on the
+put the merged text. @xref{sdiff}, for more details on the
options to @command{sdiff}.
Another way to merge files interactively is to use the Emacs Lisp
@@ -2628,7 +2624,7 @@ patch the file as well as it can. If no
normally replaces each file @var{f} with its new version, putting reject
hunks (if any) into @samp{@var{f}.rej}.
-@xref{Invoking patch}, for detailed information on the options to
+@xref{patch}, for detailed information on the options to
@command{patch}.
@menu
@@ -3546,7 +3542,7 @@ but bear in mind that @command{patch} ty
lines for proper operation when patches do not exactly match the input
files.
-@node Invoking cmp
+@node cmp
@chapter Invoking @command{cmp}
@cindex invoking @command{cmp}
@cindex @command{cmp} invocation
@@ -3740,7 +3736,7 @@ quettabyte: @math{10^{30} = 1,000,000,00
quebibyte: @math{2^{100} = 1,267,650,600,228,229,401,496,703,205,376}.
@end table
-@node Invoking diff
+@node diff
@chapter Invoking @command{diff}
@cindex invoking @command{diff}
@cindex @command{diff} invocation
@@ -4118,7 +4114,7 @@ Use the side by side output format. @xr
Ignore white space at line end. @xref{White Space}.
@end table
-@node Invoking diff3
+@node diff3
@chapter Invoking @command{diff3}
@cindex invoking @command{diff3}
@cindex @command{diff3} invocation
@@ -4241,7 +4237,7 @@ Like @option{-e}, except output only the
@xref{Which Changes}.
@end table
-@node Invoking patch
+@node patch
@chapter Invoking @command{patch}
@cindex invoking @command{patch}
@cindex @command{patch} invocation
@@ -4461,7 +4457,7 @@ headers use UTC. @xref{Patching Timesta
@end table
-@node Invoking sdiff
+@node sdiff
@chapter Invoking @command{sdiff}
@cindex invoking @command{sdiff}
@cindex @command{sdiff} invocation