Lines Matching refs:diff3
12 * 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
220 * diff.c, diff3.c: Plug memory leaks.
241 * analyze.c: applied Paul Eggert's patch to fix the diff3 merge
261 * build_diff.com: Add diff3.c
269 New diff3 library for CVS.
270 * Makefile.in (SOURCES): Add diff3.c.
271 (OBJECTS): Add diff3.o.
272 * diff3.c: New file, copied from diffutils-2.7. See diffutils for
288 perror_with_exit(), but these cannot be used to abort diff3: both
292 since both are declared static to diff3.c and should not clash
294 * diff3.c (diff3_fatal): Renamed from fatal.
412 * version.c, diff.c, diff.h, cmp.c, diff3.c, sdiff.c
414 * diff.c, util.c, diff.h, diff3.c, error.c (diff_program_name):