Home
last modified time | relevance | path

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

12

/openbsd-src/usr.bin/diff3/
H A DMakefile4 MAN= diff3.1
9 ${.CURDIR}/diff3.ksh ${DESTDIR}/usr/bin/diff3
/openbsd-src/gnu/usr.bin/cvs/diff/
H A DChangeLog12 * diff3.c (main): changed the common file of the two diffs to
19 the diff3 merge bug described in ccvs/doc/DIFFUTILS-2.7-BUG. The
20 patch is no longer necessary now that diff3 does its differences
70 * diff3.c (read_diff): Use cvs_temp_name () instead of tmpnam () so
79 * diff3.c (diff3_run, make_3way_diff): Plug memory leaks.
88 * diff3.c: Explicitly initialize zero_diff3 to placate neurotic
129 * diff3.c (diff3_run): Use a separate stream for the input to
142 diff.h, diff3.c, diffrun.h, dir.c, ed.c, io.c, normal.c, system.h,
177 * diff3.c (read_diff): Don't set my_callbacks.printf_output.
191 * diff3.c: Include diffrun.h. Change several functions to use
[all …]
H A Dbuild_diff.com15 $ CC diff3.c
18 side.obj,version.obj,diff3.obj
H A DMakefile.in93 libdiff_a_SOURCES = diff.c diff3.c analyze.c cmpbuf.c cmpbuf.h io.c \
109 am_libdiff_a_OBJECTS = diff.$(OBJEXT) diff3.$(OBJEXT) analyze.$(OBJEXT) \
130 @AMDEP_TRUE@ $(DEPDIR)/diff3.Po $(DEPDIR)/dir.Po $(DEPDIR)/ed.Po \
202 @_am_include@ @_am_quote@$(DEPDIR)/diff3.Po@_am_quote@
H A DMakefile.am20 libdiff_a_SOURCES = diff.c diff3.c analyze.c cmpbuf.c cmpbuf.h io.c \
H A 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);
H A Dlibdiff.dsp98 SOURCE=.\diff3.c
/openbsd-src/regress/usr.bin/
H A DMakefile6 SUBDIR+= dc diff diff3 dirname doas
/openbsd-src/usr.bin/rcs/
H A DMakefile9 rcsprog.c rlog.c rcsutil.c buf.c date.y diff.c diff3.c rcs.c rcsnum.c \
/openbsd-src/usr.bin/cvs/
H A DMakefile8 checkout.c client.c buf.c cmd.c date.y diff.c diff3.c \
/openbsd-src/usr.bin/
H A DMakefile10 dc deroff diff diff3 dig dirname doas du encrypt env expand false file \
/openbsd-src/gnu/usr.bin/cvs/emx/
H A DMakefile.in138 ${diff_srcdir}/diff3.c \
233 ${diff_srcdir}/diff3.o \
H A DMakefile138 ${diff_srcdir}/diff3.c \
233 ${diff_srcdir}/diff3.o \
/openbsd-src/gnu/usr.bin/texinfo/
H A Ddir-example217 * diff3: (diff)Invoking diff3. Three-way diff.
/openbsd-src/gnu/usr.bin/cvs/doc/
H A Dcvs.info-8706 `Usage: diff3 [-exEX3 [-i | -m] [-L label1 -L label3]] file1 file2 file3'
708 This indicates a problem with the installation of `diff3' and
710 diff3, but it is finding unix diff3 instead. The exact text of
713 rely on external `rcsmerge' or `diff3' programs.
H A Dcvs.info-1203 enough to spook the merge (i.e. `diff3') command.
H A Dcvs.texinfo352 to spook the merge (i.e. @code{diff3}) command.
13314 @item Usage: diff3 [-exEX3 [-i | -m] [-L label1 -L label3]] file1 file2 file3
13319 @code{diff3} and @code{rcsmerge}. Specifically
13320 @code{rcsmerge} was compiled to look for GNU diff3, but
13321 it is finding unix diff3 instead. The exact text of
13325 @code{rcsmerge} or @code{diff3} programs.
H A DChangeLog1973 * cvs.texinfo (Error messages): Add diff3 usage message.
/openbsd-src/gnu/usr.bin/cvs/
H A Dcvsnt.mak109 -@erase ".\WinRel\diff3.obj"
238 "$(INTDIR)/diff3.obj" \
393 -@erase ".\WinDebug\diff3.obj"
524 "$(INTDIR)/diff3.obj" \
3433 SOURCE=.\diff\diff3.c
3444 "$(INTDIR)\diff3.obj" : $(SOURCE) $(DEP_CPP_DIFF3) "$(INTDIR)"
H A DFAQ476 -j" option, which depends on the version of "diff3" you configured RCS
1521 of "diff" and "diff3" programs. See 1B.4 for suggestions.
1581 and make sure you are using the GNU versions of "diff" and "diff3" or
3360 If you configured CVS to use the GNU version of "diff" and "diff3",
3768 text merge techniques. Straight text merge programs like "diff3" are
4476 If you configured CVS to use the GNU version of "diff" and "diff3",
6090 The diff3 program provided by GNU diff version 1.15 has a bug that
6102 A change in the overlap format was introduced in GNU diff3 between
H A DTODO89 98. If diff3 bombs out (too many differences) cvs then thinks that the file
/openbsd-src/gnu/usr.bin/texinfo/util/
H A Ddir-example305 * diff3: (diff)Invoking diff3. Compare 3 files line by line.
/openbsd-src/gnu/usr.bin/cvs/src/
H A DChangeLog-971058 Librarify rcsmerge/diff3.
1060 selected files and diff3 them. Take new `rcs' and `workfile'
/openbsd-src/gnu/usr.bin/binutils-2.17/etc/
H A Dstandards.texi2996 instead of a manual for @code{diff} and a manual for @code{diff3}, we
/openbsd-src/gnu/usr.bin/binutils/etc/
H A Dstandards.texi2996 instead of a manual for @code{diff} and a manual for @code{diff3}, we

12