Home
last modified time | relevance | path

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

/netbsd/src/external/gpl2/xcvs/dist/diff/
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 …]
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)"
Dbuild_diff.com16 $ CC diff3.c
19 side.obj,version.obj,diff3.obj
DMakefile.am20 libdiff_a_SOURCES = diff.c diff3.c analyze.c cmpbuf.c cmpbuf.h io.c \
Ddiff3.c267 struct diff3_block *diff3; local
477 diff3 = make_3way_diff (thread0, thread1);
480 = output_diff3_edscript (diff3, mapping, rev_mapping,
487 conflicts_found = output_diff3_merge (mfp, diff3, mapping, rev_mapping,
496 output_diff3 (diff3, mapping, rev_mapping);
502 free_diff3_blocks(diff3);
DMakefile.in110 am_libdiff_a_OBJECTS = diff.$(OBJEXT) diff3.$(OBJEXT) \
249 libdiff_a_SOURCES = diff.c diff3.c analyze.c cmpbuf.c cmpbuf.h io.c \
314 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diff3.Po@am__quote@
Dlibdiff.dep52 .\diff3.c : \
Dlibdiff.dsp108 SOURCE=.\diff3.c
/netbsd/src/external/lgpl3/gmp/dist/tests/mpz/
Dt-nextprime.c71 extern short diff3[];
93 "0x8a43866f5776ccd5b02186e90d28946aeb0eeec5", diff3); in main()
203 short diff3[] = variable
/netbsd/src/usr.bin/crunch/examples/
Dreally-big.conf102 progs bc cpio diff diff3 gas gawk grep gzip sdiff sort tar
/netbsd/src/usr.bin/spell/spell/
Dspecial.netbsd231 diff3
/netbsd/src/share/man/tools/
Dsp.ignore192 diff3
/netbsd/src/external/gpl2/xcvs/dist/
DTODO59 98. If diff3 bombs out (too many differences) cvs then thinks that the file
DFAQ491 -j" option, which depends on the version of "diff3" you configured RCS
1536 of "diff" and "diff3" programs. See 1B.4 for suggestions.
3355 If you configured CVS to use the GNU version of "diff" and "diff3",
3763 text merge techniques. Straight text merge programs like "diff3" are
4471 If you configured CVS to use the GNU version of "diff" and "diff3",
6085 The diff3 program provided by GNU diff version 1.15 has a bug that
6097 A change in the overlap format was introduced in GNU diff3 between
DNEWS706 diff3. This will potentially re-apply the diffs between the two revisions to
/netbsd/src/external/gpl2/xcvs/dist/src/
DChangeLog-971058 Librarify rcsmerge/diff3.
1060 selected files and diff3 them. Take new `rcs' and `workfile'
DChangeLog11430 it doesn't really exercise the diff/diff3 library. -kingdon]
/netbsd/src/doc/
DCHANGES.prev468 diff(1): update diff, diff3, and sdiff to gnu diffutils 2.3. (jtc)
748 upgraded diff, diff3, and sdiff to version 2.4. (jtc)
778 upgraded diff, diff3, and sdiff to version 2.5. (jtc)
935 upgraded diff, diff3, and sdiff to version 2.6. (jtc)
1368 integrated diff, diff3, & sdiff manpages by Larry Jones
1613 upgraded diff, diff3, and sdiff to version 2.7. (jtc)
7292 diff(1), diff3(1), sdiff(1): upgraded to diffutils-2.8.1 [wiz 20030126]
/netbsd/src/external/gpl2/xcvs/dist/doc/
Dcvs.texinfo377 to spook the merge (i.e. @code{diff3}) command.
15924 @item Usage: diff3 [-exEX3 [-i | -m] [-L label1 -L label3]] file1 file2 file3
15929 @code{diff3} and @code{rcsmerge}. Specifically
15930 @code{rcsmerge} was compiled to look for GNU diff3, but
15931 it is finding unix diff3 instead. The exact text of
15935 @code{rcsmerge} or @code{diff3} programs.
DChangeLog3689 * cvs.texinfo (Error messages): Add diff3 usage message.
/netbsd/src/external/gpl2/xcvs/dist/doc/i18n/pt_BR/
Dcvs.texinfo540 @c <en>to spook the merge (i.e. @code{diff3}) command.
547 (i.e. @code{diff3}).
20775 @item Usage: diff3 [-exEX3 [-i | -m] [-L label1 -L label3]] file1 file2 file3
20780 @code{diff3} and @code{rcsmerge}. Specifically
20781 @code{rcsmerge} was compiled to look for GNU diff3, but
20782 it is finding unix diff3 instead. The exact text of
20786 @code{rcsmerge} or @code{diff3} programs.
/netbsd/src/distrib/sets/lists/man/
Dmi144 ./usr/share/man/cat1/diff3.0 man-util-catman .cat
3726 ./usr/share/man/man1/diff3.1 man-util-man .man
/netbsd/src/distrib/sets/lists/debug/
Dmi542 ./usr/libdata/debug/usr/bin/diff3.debug comp-util-debug debug
/netbsd/src/distrib/sets/lists/base/
Dmi591 ./usr/bin/diff3 base-util-bin