Lines Matching refs:diff3

56 	* 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.
391 	* diff3.c: Explicitly initialize zero_diff3 to placate neurotic
432 	* diff3.c (diff3_run): Use a separate stream for the input to
445 	diff.h, diff3.c, diffrun.h, dir.c, ed.c, io.c, normal.c, system.h,
480 	* diff3.c (read_diff): Don't set my_callbacks.printf_output.
494 	* diff3.c: Include diffrun.h.  Change several functions to use
523 	* diff.c, diff3.c: Plug memory leaks.
544 	* analyze.c: applied Paul Eggert's patch to fix the diff3 merge
564 	* build_diff.com: Add diff3.c
572 	New diff3 library for CVS.
573 	* Makefile.in (SOURCES): Add diff3.c.
574 	(OBJECTS): Add diff3.o.
575 	* diff3.c: New file, copied from diffutils-2.7.  See diffutils for
591  	perror_with_exit(), but these cannot be used to abort diff3: both
595  	since both are declared static to diff3.c and should not clash
597 	* diff3.c (diff3_fatal): Renamed from fatal.
715 	* version.c, diff.c, diff.h, cmp.c, diff3.c, sdiff.c
717 	* diff.c, util.c, diff.h, diff3.c, error.c (diff_program_name):