HomeSort by: relevance | last modified time | path
    Searched refs:diff3 (Results 1 - 15 of 15) sorted by relevancy

  /src/usr.bin/diff3/
Makefile 1 PROG= diff3
  /src/external/gpl2/diffutils/bin/
Makefile 5 SUBDIR= diff diff3 # sdiff cmp
  /src/external/gpl2/diffutils/bin/diff3/
Makefile 8 PROG= diff3
9 SRCS= diff3.c version.c
  /src/tests/usr.bin/diff3/
t_diff3.sh 1 atf_test_case diff3
10 diff3 $(atf_get_srcdir)/1.txt $(atf_get_srcdir)/2.txt $(atf_get_srcdir)/3.txt
13 diff3 -T $(atf_get_srcdir)/1.txt $(atf_get_srcdir)/2.txt $(atf_get_srcdir)/3.txt
16 diff3 -e $(atf_get_srcdir)/1.txt $(atf_get_srcdir)/2.txt $(atf_get_srcdir)/3.txt
19 diff3 -x $(atf_get_srcdir)/1.txt $(atf_get_srcdir)/2.txt $(atf_get_srcdir)/3.txt
22 diff3 -3 $(atf_get_srcdir)/1.txt $(atf_get_srcdir)/2.txt $(atf_get_srcdir)/3.txt
25 diff3 -i $(atf_get_srcdir)/1.txt $(atf_get_srcdir)/2.txt $(atf_get_srcdir)/3.txt
31 diff3 -e $(atf_get_srcdir)/long-m.txt $(atf_get_srcdir)/long-o.txt $(atf_get_srcdir)/long-y.txt
37 diff3 -A -L 1 -L 2 -L 3 $(atf_get_srcdir)/1.txt $(atf_get_srcdir)/2.txt $(atf_get_srcdir)/3.txt
40 diff3 -A -L long-m.txt -L long-o.txt -L long-y.txt $(atf_get_srcdir)/long-m.txt $(atf_get_srcdir)/long-o (…)
    [all...]
Makefile 5 TESTSDIR= ${TESTSBASE}/usr.bin/diff3
  /src/external/lgpl3/gmp/dist/tests/mpz/
t-nextprime.c 71 extern short diff3[];
93 "0x8a43866f5776ccd5b02186e90d28946aeb0eeec5", diff3);
203 short diff3[] = variable
  /src/external/gpl2/xcvs/dist/diff/
build_diff.com 16 $ CC diff3.c
19 side.obj,version.obj,diff3.obj
Makefile.am 20 libdiff_a_SOURCES = diff.c diff3.c analyze.c cmpbuf.c cmpbuf.h io.c \
libdiff.mak 55 -@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)"
diff3.c 1 /* Three way file comparison program (diff3) for Project GNU.
26 /* diff3.c has a real initialize_main function. */
48 * Internal data structures and macros for the diff3 program; includes
49 * data structures for both diff3 diffs and normal diffs.
137 * Access the type of a diff3 block.
167 /* If nonzero, write out an ed script instead of the standard diff3 format. */
230 /* Permit non-local exits from diff3. */
269 struct diff3_block *diff3;
325 (*callbacks->write_stdout) ("diff3 - GNU diffutils version ");
330 printf ("diff3 - GNU diffutils version %s\n", diff_version_string)
267 struct diff3_block *diff3; local
    [all...]
  /src/tests/usr.bin/
Makefile 9 diff diff3 dirname error find fstat ftp gcov gdb grep gzip id \
  /src/usr.bin/
Makefile 67 SUBDIR+= diff diff3
  /src/external/gpl2/diffutils/dist/src/
diff3.c 1 /* $NetBSD: diff3.c,v 1.2 2016/01/13 03:39:28 christos Exp $ */
3 /* diff3 - compare three files line by line
45 * Internal data structures and macros for the diff3 program; includes
46 * data structures for both diff3 diffs and normal diffs.
134 * Access the type of a diff3 block.
158 /* If nonzero, write out an ed script instead of the standard diff3 format. */
246 struct diff3_block *diff3;
300 printf ("diff3 %s\n%s\n\n%s\n\n%s\n",
352 diff3 might report phantom changes from file1 to file2.
399 diff3 = make_3way_diff (thread0, thread1)
244 struct diff3_block *diff3; local
    [all...]
  /src/external/gpl2/rcs/dist/
configure 427 : ${DIFF3=${DIFF}3}
628 # Set DIFF3 to the name of the diff3 program.
629 # In some systems (e.g. BSD/OS 2.0), diffutils diff3 lives in /usr/libexec.
632 echo $ac_n "checking diff3 -m""... $ac_c" 1>&6
637 rcs_cv_prog_diff3_bin=$DIFF3
640 PATH=$diff3PATH sh -c "exec diff3 -E -m -L 0 -L 1 -L 2 conftest0 conftest1 /dev/null" >conftestout 2>/dev/null
649 then rcs_cv_prog_diff3_bin=diff3
669 case "$DIFF3" in
671 ac_cv_path_DIFF3="$DIFF3" # Let the user override the test with a path
    [all...]
  /src/usr.bin/crunch/examples/
really-big.conf 102 progs bc cpio diff diff3 gas gawk grep gzip sdiff sort tar

Completed in 25 milliseconds