Searched refs:diff3 (Results 1 - 7 of 7) sorted by relevance

/freebsd-9.3-release/gnu/usr.bin/diff3/
H A DMakefile8 PROG= diff3
9 SRCS= diff3.c version-etc.c \
21 .for f in diff3.c
/freebsd-9.3-release/gnu/usr.bin/cvs/libdiff/
H A DMakefile14 SRCS = diff.c diff3.c analyze.c cmpbuf.c cmpbuf.h io.c context.c ed.c \
/freebsd-9.3-release/contrib/cvs/diff/
H A DMakefile.am20 libdiff_a_SOURCES = diff.c diff3.c analyze.c cmpbuf.c cmpbuf.h io.c \
H A Ddiff3.c1 /* Three way file comparison program (diff3) for Project GNU.
29 /* diff3.c has a real initialize_main function. */
51 * Internal data structures and macros for the diff3 program; includes
52 * data structures for both diff3 diffs and normal diffs.
140 * Access the type of a diff3 block.
170 /* If nonzero, write out an ed script instead of the standard diff3 format. */
233 /* Permit non-local exits from diff3. */
272 struct diff3_block *diff3;
328 (*callbacks->write_stdout) ("diff3 - GNU diffutils version ");
333 printf ("diff3
270 struct diff3_block *diff3; local
[all...]
/freebsd-9.3-release/gnu/usr.bin/
H A DMakefile10 diff3 \
/freebsd-9.3-release/contrib/diff/src/
H A Ddiff3.c0 /* diff3 - compare three files line by line
39 /* Internal data structures and macros for the diff3 program; includes
40 data structures for both diff3 diffs and normal diffs. */
114 /* Access the type of a diff3 block. */
138 /* If nonzero, write out an ed script instead of the standard diff3 format. */
224 struct diff3_block *diff3;
281 version_etc (stdout, "diff3", PACKAGE_NAME, PACKAGE_VERSION,
332 diff3 might report phantom changes from file1 to file2.
382 diff3 = make_3way_diff (thread0, thread1);
385 = output_diff3_edscript (stdout, diff3, mappin
222 struct diff3_block *diff3; local
[all...]
/freebsd-9.3-release/usr.sbin/crunch/examples/
H A Dreally-big.conf112 progs bc cpio diff diff3 gas gawk grep gzip sdiff sort tar

Completed in 62 milliseconds