Home
last modified time | relevance | path

Searched refs:diff3 (Results 1 – 25 of 58) sorted by relevance

123

/netbsd-src/external/gpl2/diffutils/dist/po/
H A Ddiffutils.pot179 #: src/analyze.c:1058 src/diff3.c:1413 src/util.c:526
187 #: src/cmp.c:118 src/diff.c:817 src/diff3.c:427 src/sdiff.c:168
201 #: src/cmp.c:154 src/diff.c:826 src/diff3.c:435 src/sdiff.c:177
207 #: src/cmp.c:156 src/diff.c:828 src/diff.c:1354 src/diff3.c:437
241 #: src/cmp.c:167 src/diff.c:904 src/diff3.c:455 src/sdiff.c:204
245 #: src/cmp.c:168 src/diff.c:905 src/diff3.c:456 src/sdiff.c:205
273 #: src/cmp.c:188 src/diff.c:911 src/diff3.c:475 src/sdiff.c:223
282 #: src/cmp.c:258 src/diff.c:734 src/diff3.c:333 src/sdiff.c:558
287 #: src/cmp.c:270 src/diff.c:736 src/diff3.c:335 src/sdiff.c:560
322 #: src/diff.c:420 src/diff3.c:315
[all …]
H A Den_GB.po181 #: src/analyze.c:1058 src/diff3.c:1413 src/util.c:526
189 #: src/cmp.c:118 src/diff.c:817 src/diff3.c:427 src/sdiff.c:168
203 #: src/cmp.c:154 src/diff.c:826 src/diff3.c:435 src/sdiff.c:177
209 #: src/cmp.c:156 src/diff.c:828 src/diff.c:1354 src/diff3.c:437
243 #: src/cmp.c:167 src/diff.c:904 src/diff3.c:455 src/sdiff.c:204
247 #: src/cmp.c:168 src/diff.c:905 src/diff3.c:456 src/sdiff.c:205
275 #: src/cmp.c:188 src/diff.c:911 src/diff3.c:475 src/sdiff.c:223
284 #: src/cmp.c:258 src/diff.c:734 src/diff3.c:333 src/sdiff.c:558
289 #: src/cmp.c:270 src/diff.c:736 src/diff3.c:335 src/sdiff.c:560
324 #: src/diff.c:420 src/diff3.c:315
[all …]
H A Dja.po186 #: src/analyze.c:1058 src/diff3.c:1413 src/util.c:526
194 #: src/cmp.c:118 src/diff.c:817 src/diff3.c:427 src/sdiff.c:168
208 #: src/cmp.c:154 src/diff.c:826 src/diff3.c:435 src/sdiff.c:177
214 #: src/cmp.c:156 src/diff.c:828 src/diff.c:1354 src/diff3.c:437
248 #: src/cmp.c:167 src/diff.c:904 src/diff3.c:455 src/sdiff.c:204
252 #: src/cmp.c:168 src/diff.c:905 src/diff3.c:456 src/sdiff.c:205
284 #: src/cmp.c:188 src/diff.c:911 src/diff3.c:475 src/sdiff.c:223
293 #: src/cmp.c:258 src/diff.c:734 src/diff3.c:333 src/sdiff.c:558
298 #: src/cmp.c:270 src/diff.c:736 src/diff3.c:335 src/sdiff.c:560
335 #: src/diff.c:420 src/diff3.c:315
[all …]
H A Dhe.po180 #: src/analyze.c:1058 src/diff3.c:1413 src/util.c:526
188 #: src/cmp.c:118 src/diff.c:817 src/diff3.c:427 src/sdiff.c:168
202 #: src/cmp.c:154 src/diff.c:826 src/diff3.c:435 src/sdiff.c:177
208 #: src/cmp.c:156 src/diff.c:828 src/diff.c:1354 src/diff3.c:437
244 #: src/cmp.c:167 src/diff.c:904 src/diff3.c:455 src/sdiff.c:204
248 #: src/cmp.c:168 src/diff.c:905 src/diff3.c:456 src/sdiff.c:205
279 #: src/cmp.c:188 src/diff.c:911 src/diff3.c:475 src/sdiff.c:223
288 #: src/cmp.c:258 src/diff.c:734 src/diff3.c:333 src/sdiff.c:558
293 #: src/cmp.c:270 src/diff.c:736 src/diff3.c:335 src/sdiff.c:560
330 #: src/diff.c:420 src/diff3.c:315
[all …]
H A Dzh_TW.po179 #: src/analyze.c:1058 src/diff3.c:1413 src/util.c:526
187 #: src/cmp.c:118 src/diff.c:817 src/diff3.c:427 src/sdiff.c:168
201 #: src/cmp.c:154 src/diff.c:826 src/diff3.c:435 src/sdiff.c:177
207 #: src/cmp.c:156 src/diff.c:828 src/diff.c:1354 src/diff3.c:437
241 #: src/cmp.c:167 src/diff.c:904 src/diff3.c:455 src/sdiff.c:204
245 #: src/cmp.c:168 src/diff.c:905 src/diff3.c:456 src/sdiff.c:205
276 #: src/cmp.c:188 src/diff.c:911 src/diff3.c:475 src/sdiff.c:223
285 #: src/cmp.c:258 src/diff.c:734 src/diff3.c:333 src/sdiff.c:558
290 #: src/cmp.c:270 src/diff.c:736 src/diff3.c:335 src/sdiff.c:560
327 #: src/diff.c:420 src/diff3.c:315
[all …]
H A Dsv.po182 #: src/analyze.c:1058 src/diff3.c:1413 src/util.c:526
190 #: src/cmp.c:118 src/diff.c:817 src/diff3.c:427 src/sdiff.c:168
204 #: src/cmp.c:154 src/diff.c:826 src/diff3.c:435 src/sdiff.c:177
210 #: src/cmp.c:156 src/diff.c:828 src/diff.c:1354 src/diff3.c:437
246 #: src/cmp.c:167 src/diff.c:904 src/diff3.c:455 src/sdiff.c:204
250 #: src/cmp.c:168 src/diff.c:905 src/diff3.c:456 src/sdiff.c:205
281 #: src/cmp.c:188 src/diff.c:911 src/diff3.c:475 src/sdiff.c:223
292 #: src/cmp.c:258 src/diff.c:734 src/diff3.c:333 src/sdiff.c:558
297 #: src/cmp.c:270 src/diff.c:736 src/diff3.c:335 src/sdiff.c:560
334 #: src/diff.c:420 src/diff3.c:315
[all …]
H A Dde.po182 #: src/analyze.c:1058 src/diff3.c:1413 src/util.c:526
190 #: src/cmp.c:118 src/diff.c:817 src/diff3.c:427 src/sdiff.c:168
204 #: src/cmp.c:154 src/diff.c:826 src/diff3.c:435 src/sdiff.c:177
210 #: src/cmp.c:156 src/diff.c:828 src/diff.c:1354 src/diff3.c:437
249 #: src/cmp.c:167 src/diff.c:904 src/diff3.c:455 src/sdiff.c:204
253 #: src/cmp.c:168 src/diff.c:905 src/diff3.c:456 src/sdiff.c:205
286 #: src/cmp.c:188 src/diff.c:911 src/diff3.c:475 src/sdiff.c:223
295 #: src/cmp.c:258 src/diff.c:734 src/diff3.c:333 src/sdiff.c:558
300 #: src/cmp.c:270 src/diff.c:736 src/diff3.c:335 src/sdiff.c:560
337 #: src/diff.c:420 src/diff3.c:315
[all …]
H A Did.po182 #: src/analyze.c:1058 src/diff3.c:1413 src/util.c:526
190 #: src/cmp.c:118 src/diff.c:817 src/diff3.c:427 src/sdiff.c:168
204 #: src/cmp.c:154 src/diff.c:826 src/diff3.c:435 src/sdiff.c:177
210 #: src/cmp.c:156 src/diff.c:828 src/diff.c:1354 src/diff3.c:437
244 #: src/cmp.c:167 src/diff.c:904 src/diff3.c:455 src/sdiff.c:204
248 #: src/cmp.c:168 src/diff.c:905 src/diff3.c:456 src/sdiff.c:205
279 #: src/cmp.c:188 src/diff.c:911 src/diff3.c:475 src/sdiff.c:223
288 #: src/cmp.c:258 src/diff.c:734 src/diff3.c:333 src/sdiff.c:558
293 #: src/cmp.c:270 src/diff.c:736 src/diff3.c:335 src/sdiff.c:560
330 #: src/diff.c:420 src/diff3.c:315
[all …]
H A Dda.po183 #: src/analyze.c:1058 src/diff3.c:1413 src/util.c:526
191 #: src/cmp.c:118 src/diff.c:817 src/diff3.c:427 src/sdiff.c:168
205 #: src/cmp.c:154 src/diff.c:826 src/diff3.c:435 src/sdiff.c:177
211 #: src/cmp.c:156 src/diff.c:828 src/diff.c:1354 src/diff3.c:437
249 #: src/cmp.c:167 src/diff.c:904 src/diff3.c:455 src/sdiff.c:204
253 #: src/cmp.c:168 src/diff.c:905 src/diff3.c:456 src/sdiff.c:205
285 #: src/cmp.c:188 src/diff.c:911 src/diff3.c:475 src/sdiff.c:223
294 #: src/cmp.c:258 src/diff.c:734 src/diff3.c:333 src/sdiff.c:558
299 #: src/cmp.c:270 src/diff.c:736 src/diff3.c:335 src/sdiff.c:560
336 #: src/diff.c:420 src/diff3.c:315
[all …]
H A Dpl.po181 #: src/analyze.c:1058 src/diff3.c:1413 src/util.c:526
189 #: src/cmp.c:118 src/diff.c:817 src/diff3.c:427 src/sdiff.c:168
203 #: src/cmp.c:154 src/diff.c:826 src/diff3.c:435 src/sdiff.c:177
209 #: src/cmp.c:156 src/diff.c:828 src/diff.c:1354 src/diff3.c:437
245 #: src/cmp.c:167 src/diff.c:904 src/diff3.c:455 src/sdiff.c:204
249 #: src/cmp.c:168 src/diff.c:905 src/diff3.c:456 src/sdiff.c:205
280 #: src/cmp.c:188 src/diff.c:911 src/diff3.c:475 src/sdiff.c:223
289 #: src/cmp.c:258 src/diff.c:734 src/diff3.c:333 src/sdiff.c:558
294 #: src/cmp.c:270 src/diff.c:736 src/diff3.c:335 src/sdiff.c:560
331 #: src/diff.c:420 src/diff3.c:315
[all …]
H A Dcs.po181 #: src/analyze.c:1058 src/diff3.c:1413 src/util.c:526
189 #: src/cmp.c:118 src/diff.c:817 src/diff3.c:427 src/sdiff.c:168
203 #: src/cmp.c:154 src/diff.c:826 src/diff3.c:435 src/sdiff.c:177
209 #: src/cmp.c:156 src/diff.c:828 src/diff.c:1354 src/diff3.c:437
245 #: src/cmp.c:167 src/diff.c:904 src/diff3.c:455 src/sdiff.c:204
249 #: src/cmp.c:168 src/diff.c:905 src/diff3.c:456 src/sdiff.c:205
281 #: src/cmp.c:188 src/diff.c:911 src/diff3.c:475 src/sdiff.c:223
293 #: src/cmp.c:258 src/diff.c:734 src/diff3.c:333 src/sdiff.c:558
298 #: src/cmp.c:270 src/diff.c:736 src/diff3.c:335 src/sdiff.c:560
335 #: src/diff.c:420 src/diff3.c:315
[all …]
H A Dgl.po181 #: src/analyze.c:1058 src/diff3.c:1413 src/util.c:526
189 #: src/cmp.c:118 src/diff.c:817 src/diff3.c:427 src/sdiff.c:168
203 #: src/cmp.c:154 src/diff.c:826 src/diff3.c:435 src/sdiff.c:177
209 #: src/cmp.c:156 src/diff.c:828 src/diff.c:1354 src/diff3.c:437
245 #: src/cmp.c:167 src/diff.c:904 src/diff3.c:455 src/sdiff.c:204
249 #: src/cmp.c:168 src/diff.c:905 src/diff3.c:456 src/sdiff.c:205
280 #: src/cmp.c:188 src/diff.c:911 src/diff3.c:475 src/sdiff.c:223
291 #: src/cmp.c:258 src/diff.c:734 src/diff3.c:333 src/sdiff.c:558
296 #: src/cmp.c:270 src/diff.c:736 src/diff3.c:335 src/sdiff.c:560
333 #: src/diff.c:420 src/diff3.c:315
[all …]
H A Dtr.po183 #: src/analyze.c:1058 src/diff3.c:1413 src/util.c:526
191 #: src/cmp.c:118 src/diff.c:817 src/diff3.c:427 src/sdiff.c:168
205 #: src/cmp.c:154 src/diff.c:826 src/diff3.c:435 src/sdiff.c:177
211 #: src/cmp.c:156 src/diff.c:828 src/diff.c:1354 src/diff3.c:437
248 #: src/cmp.c:167 src/diff.c:904 src/diff3.c:455 src/sdiff.c:204
252 #: src/cmp.c:168 src/diff.c:905 src/diff3.c:456 src/sdiff.c:205
283 #: src/cmp.c:188 src/diff.c:911 src/diff3.c:475 src/sdiff.c:223
294 #: src/cmp.c:258 src/diff.c:734 src/diff3.c:333 src/sdiff.c:558
299 #: src/cmp.c:270 src/diff.c:736 src/diff3.c:335 src/sdiff.c:560
336 #: src/diff.c:420 src/diff3.c:315
[all …]
/netbsd-src/external/gpl2/diffutils/dist/man/
H A DMakefile.am20 dist_man_MANS = cmp.1 diff.1 diff3.1 sdiff.1
26 diff3.1: $S/diff3.c
H A DMakefile.in111 dist_man_MANS = cmp.1 diff.1 diff3.1 sdiff.1
280 diff3.1: $S/diff3.c
/netbsd-src/external/gpl2/rcs/dist/
H A Dconfigure.in168 # Set DIFF3 to the name of the diff3 program.
169 # In some systems (e.g. BSD/OS 2.0), diffutils diff3 lives in /usr/libexec.
172 AC_MSG_CHECKING([diff3 -m])
177 …PATH=$diff3PATH sh -c "exec diff3 -E -m -L 0 -L 1 -L 2 conftest0 conftest1 /dev/null" >conftestout…
186 then rcs_cv_prog_diff3_bin=diff3
203 AC_MSG_CHECKING([diff3 library program])
209 for i in /usr/*lib*/*diff3*; do
224 '') AC_MSG_ERROR(cannot find a working diff3 library program);;
H A DINSTALL.RCS43 and a diff3 that supports -A, -E and -m.
164 DIFF_L is 1 if diff and diff3 understand the -L LABEL option
174 DIFF3 is the name of the diff3 program.
175 With GNU diffutils, this is simply its user-visible diff3 program.
176 But with traditional diff3 it is the name of the undocumented diff3 auxiliary,
177 whose name is /usr/lib/diff3 or /usr/5lib/rdiff3prog or something similar.
179 DIFF3_BIN is 1 if DIFF3 is the user-visible GNU diff3 program (see DIFF3).
180 Before setting this to 1, make sure your diff3 understands -a, -L, and and -m;
181 e.g. the command `echo x | diff3 -m -L 0 -L 1 -L 2 /dev/null /dev/null -'
/netbsd-src/external/gpl2/xcvs/dist/diff/
H A DChangeLog56 * diff.c, diff3.c: Backout last change.
63 * diff3.c: Ditto.
195 * diff3.c (read_diff): Fix memory leak.
282 * diff3.c: Eliminate compiler warning. The VMS read rval is ssize_t
301 * diff3.c (diff3_run): Put the name of the output file in the error
315 * diff3.c (main): changed the common file of the two diffs to
322 the diff3 merge bug described in ccvs/doc/DIFFUTILS-2.7-BUG. The
323 patch is no longer necessary now that diff3 does its differences
373 * diff3.c (read_diff): Use cvs_temp_name () instead of tmpnam () so
382 * diff3.c (diff3_run, make_3way_diff): Plug memory leaks.
[all …]
H A Dlibdiff.mak55 -@erase "$(INTDIR)\diff3.obj"
115 "$(INTDIR)\diff3.obj" \
158 -@erase "$(INTDIR)\diff3.obj"
218 "$(INTDIR)\diff3.obj" \
267 SOURCE=.\diff3.c
269 "$(INTDIR)\diff3.obj" : $(SOURCE) "$(INTDIR)"
H A Dbuild_diff.com16 $ CC diff3.c
19 side.obj,version.obj,diff3.obj
/netbsd-src/external/lgpl3/gmp/dist/tests/mpz/
H A Dt-nextprime.c71 extern short diff3[];
93 "0x8a43866f5776ccd5b02186e90d28946aeb0eeec5", diff3); in main()
203 short diff3[] = variable
/netbsd-src/external/gpl2/diffutils/bin/diff3/
H A DMakefile8 PROG= diff3
9 SRCS= diff3.c version.c
/netbsd-src/external/gpl2/diffutils/dist/
H A DChangeLog27 * src/diff3.c (read_diff): Likewise.
28 * src/diff3.c: Include cmpbuf.h.
104 (cmp Options, diff Options, diff3 Options, patch Options,
107 (diff3 Options): Fix typo in description of -E, which used wrongly used
174 * src/diff3.c (option_help_msgid, usage): Likewise.
336 * src/diff3.c: Include c-stack.h, exitfail.h.
440 * src/diff3.c (copyright_string): Likewise.
448 * src/diff3.c (usage): Likewise.
451 * src/diff3.c (main): Remove unused variable.
520 * src/diff3.c (DIFF_PROGRAM_OPTION, HELP_OPTION): New constants.
[all …]
H A DNEWS31 * New diff3 and sdiff option:
65 * New cmp, diff, diff3, sdiff option: --help
80 * New diff3 option: -T --initial-tab
145 * New diff3 option:
147 * diff3 -m now defaults to -A, not -E.
148 * diff3 now takes up to three -L or --label options, not just two.
176 * New diff3 options:
178 * Add long-named equivalents for other diff3 options.
/netbsd-src/external/gpl2/diffutils/dist/doc/
H A Ddiff.info4 documents the GNU `diff', `diff3', `sdiff', and `cmp' commands for
27 * diff3: (diff)Invoking diff3. Compare 3 files line by line.
44 documents the GNU `diff', `diff3', `sdiff', and `cmp' commands for
75 * diff3 Merging:: Merging from a common ancestor.
84 * Invoking diff3:: Compare three files line by line.
120 You can use the `diff3' command to show differences among three
122 original, `diff3' can report the differences between the original and
151 GNU `diff3' was written by Randy Smith. GNU `sdiff' was written by
199 `diff3' normally compares three input files line by line, finds
443 If `diff3' thinks that any of the files it is comparing is binary (a
[all …]

123