1 |
.ig \"-*- nroff -*- |
.ig \"-*- nroff -*- |
2 |
Copyright (C) 2004 Free Software Foundation, Inc. |
Copyright (C) 2004, 2005 Free Software Foundation, Inc. |
3 |
|
|
4 |
This file is part of the gdiffmk utility, which is part of groff. |
This file is part of the gdiffmk utility, which is part of groff. |
5 |
Written by Mike Bianchi <MBianchi@Foveal.com <mailto:MBianchi@Foveal.com>> |
Written by Mike Bianchi <MBianchi@Foveal.com <mailto:MBianchi@Foveal.com>> |
43 |
.OP \-a \%addmark |
.OP \-a \%addmark |
44 |
.OP \-c \%changemark |
.OP \-c \%changemark |
45 |
.OP \-d \%deletemark |
.OP \-d \%deletemark |
46 |
|
[\ \c |
47 |
|
.B \-D |
48 |
|
.OP \-B |
49 |
|
.OP \-M "\ mark1 mark2" |
50 |
|
] |
51 |
.OP \-x \%diffcmd |
.OP \-x \%diffcmd |
52 |
.OP \-\- |
.OP \-\- |
53 |
.OP \-\-help |
.OP \-\-help |
54 |
.OP \-\-version |
.OP \%\-\-version |
55 |
.I \%file1 |
.I \%file1 |
56 |
.I \%file2 |
.I \%file2 |
57 |
[ |
[\ \c |
58 |
.I \%output |
.IR \%output \ \c |
59 |
] |
] |
60 |
.br |
.br |
61 |
.ad \na |
.ad \na |
117 |
.BR + . |
.BR + . |
118 |
. |
. |
119 |
.TP |
.TP |
120 |
|
.B \-B |
121 |
|
By default, the deleted texts marked by the |
122 |
|
.B \-D |
123 |
|
option end |
124 |
|
with an added troff break command, |
125 |
|
.BR .br , |
126 |
|
to ensure that the deletions are marked properly. |
127 |
|
This is the only way to guarantee that deletions and small |
128 |
|
changes get flagged. |
129 |
|
This option directs the program not to insert these breaks; it makes no |
130 |
|
sense to use it without |
131 |
|
.BR \-D . |
132 |
|
. |
133 |
|
.TP |
134 |
.BI \-c changemark |
.BI \-c changemark |
135 |
Use the |
Use the |
136 |
.I changemark |
.I changemark |
147 |
.BR * . |
.BR * . |
148 |
. |
. |
149 |
.TP |
.TP |
150 |
|
.B \-D |
151 |
|
Show the deleted portions from changed and deleted text. |
152 |
|
Default delimiting marks: |
153 |
|
.BR "[[" " .\&.\&.\&. " "]]" . |
154 |
|
. |
155 |
|
.TP |
156 |
|
.BI \-M " mark1 mark2 |
157 |
|
Change the delimiting marks for the |
158 |
|
.B \-D |
159 |
|
option. |
160 |
|
It makes no sense to use this option without |
161 |
|
.BR \-D . |
162 |
|
. |
163 |
|
.TP |
164 |
.BI \-x diffcmd |
.BI \-x diffcmd |
165 |
Use the |
Use the |
166 |
.I diffcmd |
.I diffcmd |
170 |
.IR file2 . |
.IR file2 . |
171 |
In particular, |
In particular, |
172 |
.I diffcmd |
.I diffcmd |
173 |
should accept the |
should accept the GNU |
174 |
|
.B diff |
175 |
.BI \-D name |
.BI \-D name |
176 |
option. |
option. |
177 |
Default: |
Default: |
247 |
. |
. |
248 |
. |
. |
249 |
.SH COPYRIGHT |
.SH COPYRIGHT |
250 |
Copyright \(co 2004 Free Software Foundation, Inc. |
Copyright \(co 2004, 2005 Free Software Foundation, Inc. |
251 |
. |
. |
252 |
.LP |
.LP |
253 |
.B gdiffmk |
.B gdiffmk |