1 | This is Info file diff.info, produced by Makeinfo-1.55 from the input |
---|
2 | file ./diff.texi. |
---|
3 | |
---|
4 | This file documents the the GNU `diff', `diff3', `sdiff', and `cmp' |
---|
5 | commands for showing the differences between text files and the `patch' |
---|
6 | command for using their output to update files. |
---|
7 | |
---|
8 | Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. |
---|
9 | |
---|
10 | Permission is granted to make and distribute verbatim copies of this |
---|
11 | manual provided the copyright notice and this permission notice are |
---|
12 | preserved on all copies. |
---|
13 | |
---|
14 | Permission is granted to copy and distribute modified versions of |
---|
15 | this manual under the conditions for verbatim copying, provided that |
---|
16 | the entire resulting derived work is distributed under the terms of a |
---|
17 | permission notice identical to this one. |
---|
18 | |
---|
19 | Permission is granted to copy and distribute translations of this |
---|
20 | manual into another language, under the above conditions for modified |
---|
21 | versions, except that this permission notice may be stated in a |
---|
22 | translation approved by the Foundation. |
---|
23 | |
---|
24 | |
---|
25 | File: diff.info, Node: Concept Index, Prev: Projects, Up: Top |
---|
26 | |
---|
27 | Concept Index |
---|
28 | ************* |
---|
29 | |
---|
30 | * Menu: |
---|
31 | |
---|
32 | * cmp invocation: Invoking cmp. |
---|
33 | * cmp options: cmp Options. |
---|
34 | * diff3 hunks: diff3 Hunks. |
---|
35 | * diff3 invocation: Invoking diff3. |
---|
36 | * diff3 options: diff3 Options. |
---|
37 | * diff3 sample input: Sample diff3 Input. |
---|
38 | * diff invocation: Invoking diff. |
---|
39 | * diff options: diff Options. |
---|
40 | * diff sample input: Sample diff Input. |
---|
41 | * ed script output format: ed Scripts. |
---|
42 | * ifdef output format: If-then-else. |
---|
43 | * patch input format: patch Input. |
---|
44 | * patch invocation: Invoking patch. |
---|
45 | * patch messages and questions: patch Messages. |
---|
46 | * patch options: patch Options. |
---|
47 | * sdiff invocation: Invoking sdiff. |
---|
48 | * sdiff options: sdiff Options. |
---|
49 | * sdiff output format: sdiff Option Summary. |
---|
50 | * ! output format: Context. |
---|
51 | * +- output format: Unified Format. |
---|
52 | * <<<<<<< for marking conflicts: Marking Conflicts. |
---|
53 | * < output format: Normal. |
---|
54 | * aligning tabstops: Tabs. |
---|
55 | * alternate file names: Alternate Names. |
---|
56 | * backup file names: Backups. |
---|
57 | * binary file diff: Binary. |
---|
58 | * binary file patching: Arbitrary Limits. |
---|
59 | * blank and tab difference suppression: White Space. |
---|
60 | * blank line difference suppression: Blank Lines. |
---|
61 | * brief difference reports: Brief. |
---|
62 | * bug reports: Bugs. |
---|
63 | * C function headings: C Function Headings. |
---|
64 | * C if-then-else output format: If-then-else. |
---|
65 | * case difference suppression: Case Folding. |
---|
66 | * columnar output: Side by Side. |
---|
67 | * comparing three files: Comparing Three Files. |
---|
68 | * conflict: diff3 Merging. |
---|
69 | * conflict marking: Marking Conflicts. |
---|
70 | * context output format: Context. |
---|
71 | * diagnostics from patch: patch Messages. |
---|
72 | * diff merging: Interactive Merging. |
---|
73 | * directories and patch: patch Directories. |
---|
74 | * directory structure changes: Changing Structure. |
---|
75 | * empty files, removing: Empty Files. |
---|
76 | * file name alternates: Alternate Names. |
---|
77 | * file names with unusual characters: Unusual File Names. |
---|
78 | * format of diff3 output: Comparing Three Files. |
---|
79 | * format of diff output: Output Formats. |
---|
80 | * formats for if-then-else line groups: Line Group Formats. |
---|
81 | * forward ed script output format: Forward ed. |
---|
82 | * full lines: Incomplete Lines. |
---|
83 | * function headings, C: C Function Headings. |
---|
84 | * fuzz factor when patching: Inexact. |
---|
85 | * headings: Sections. |
---|
86 | * hunks: Hunks. |
---|
87 | * hunks for diff3: diff3 Hunks. |
---|
88 | * if-then-else output format: If-then-else. |
---|
89 | * imperfect patch application: Imperfect. |
---|
90 | * incomplete line merging: Merging Incomplete Lines. |
---|
91 | * incomplete lines: Incomplete Lines. |
---|
92 | * inexact patches: Inexact. |
---|
93 | * interactive merging: Interactive Merging. |
---|
94 | * introduction: Comparison. |
---|
95 | * invoking cmp: Invoking cmp. |
---|
96 | * invoking diff3: Invoking diff3. |
---|
97 | * invoking diff: Invoking diff. |
---|
98 | * invoking patch: Invoking patch. |
---|
99 | * invoking sdiff: Invoking sdiff. |
---|
100 | * large files: Large Files. |
---|
101 | * line formats: Line Formats. |
---|
102 | * line group formats: Line Group Formats. |
---|
103 | * merge commands: Merge Commands. |
---|
104 | * merged diff3 format: Bypassing ed. |
---|
105 | * merged output format: If-then-else. |
---|
106 | * merging from a common ancestor: diff3 Merging. |
---|
107 | * merging interactively: Merge Commands. |
---|
108 | * messages from patch: patch Messages. |
---|
109 | * multiple patches: Multiple Patches. |
---|
110 | * newline treatment by diff: Incomplete Lines. |
---|
111 | * normal output format: Normal. |
---|
112 | * options for cmp: cmp Options. |
---|
113 | * options for diff3: diff3 Options. |
---|
114 | * options for diff: diff Options. |
---|
115 | * options for patch: patch Options. |
---|
116 | * options for sdiff: sdiff Options. |
---|
117 | * output formats: Output Formats. |
---|
118 | * overlap: diff3 Merging. |
---|
119 | * overlapping change, selection of: Which Changes. |
---|
120 | * overview of diff and patch: Overview. |
---|
121 | * paginating diff output: Pagination. |
---|
122 | * patch making tips: Making Patches. |
---|
123 | * patching directories: patch Directories. |
---|
124 | * performance of diff: diff Performance. |
---|
125 | * projects for directories: Shortcomings. |
---|
126 | * RCS script output format: RCS. |
---|
127 | * regular expression matching headings: Specified Headings. |
---|
128 | * regular expression suppression: Specified Folding. |
---|
129 | * reject file names: Rejects. |
---|
130 | * removing empty files: Empty Files. |
---|
131 | * reporting bugs: Bugs. |
---|
132 | * reversed patches: Reversed Patches. |
---|
133 | * sample input for diff3: Sample diff3 Input. |
---|
134 | * sample input for diff: Sample diff Input. |
---|
135 | * script output formats: Scripts. |
---|
136 | * section headings: Sections. |
---|
137 | * side by side: Side by Side. |
---|
138 | * side by side format: Side by Side Format. |
---|
139 | * special files: Special Files. |
---|
140 | * specified headings: Specified Headings. |
---|
141 | * summarizing which files differ: Brief. |
---|
142 | * System V diff3 compatibility: Saving the Changed File. |
---|
143 | * tab and blank difference suppression: White Space. |
---|
144 | * tabstop alignment: Tabs. |
---|
145 | * text versus binary diff: Binary. |
---|
146 | * tips for patch making: Making Patches. |
---|
147 | * two-column output: Side by Side. |
---|
148 | * unified output format: Unified Format. |
---|
149 | * unmerged change: Which Changes. |
---|
150 | * white space in patches: Changed White Space. |
---|
151 | |
---|
152 | |
---|