Home
last modified time | relevance | path

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

/freebsd-14.2/usr.bin/diff3/tests/
H A Ddiff3_test.sh2 atf_test_case diff3
11 diff3 $(atf_get_srcdir)/1.txt $(atf_get_srcdir)/2.txt $(atf_get_srcdir)/3.txt
14 …diff3 --strip-trailing-cr $(atf_get_srcdir)/1cr.txt $(atf_get_srcdir)/2.txt $(atf_get_srcdir)/3.txt
17 diff3 -T $(atf_get_srcdir)/1.txt $(atf_get_srcdir)/2.txt $(atf_get_srcdir)/3.txt
20 diff3 -e $(atf_get_srcdir)/1.txt $(atf_get_srcdir)/2.txt $(atf_get_srcdir)/3.txt
23 diff3 -E -L 1 -L 2 -L 3 $(atf_get_srcdir)/1.txt $(atf_get_srcdir)/2.txt $(atf_get_srcdir)/3.txt
26 diff3 -X -L 1 -L 2 -L 3 $(atf_get_srcdir)/1.txt $(atf_get_srcdir)/2.txt $(atf_get_srcdir)/3.txt
29 diff3 -x $(atf_get_srcdir)/1.txt $(atf_get_srcdir)/2.txt $(atf_get_srcdir)/3.txt
32 diff3 -3 $(atf_get_srcdir)/1.txt $(atf_get_srcdir)/2.txt $(atf_get_srcdir)/3.txt
35 diff3 -i $(atf_get_srcdir)/1.txt $(atf_get_srcdir)/2.txt $(atf_get_srcdir)/3.txt
[all …]
/freebsd-14.2/gnu/usr.bin/diff3/
H A DMakefile7 PROG= diff3
8 SRCS= diff3.c version-etc.c \
/freebsd-14.2/contrib/diff/
H A DChangeLog54 Detailed if-then-else, diff3 Hunks, Detailed diff3 Normal):
93 * src/diff3.c (usage): Likewise.
99 * src/diff3.c (main): Likewise.
104 * src/diff3.c (main): Likewise.
124 * src/diff3.c: Include unlocked-io.h.
488 * src/diff3.c: Include cmpbuf.h.
913 * src/diff3.c (usage): Likewise.
1092 * src/diff3.c (main):
1170 * diff3.c (read_diff): Likewise.
1896 * diff3.c (quotesys.h): Include.
[all …]
H A DNEWS5 * New diff3 option --strip-trailing-cr.
72 * New diff3 and sdiff option:
107 * New cmp, diff, diff3, sdiff option: --help
122 * New diff3 option: -T --initial-tab
187 * New diff3 option:
189 * diff3 -m now defaults to -A, not -E.
190 * diff3 now takes up to three -L or --label options, not just two.
218 * New diff3 options:
220 * Add long-named equivalents for other diff3 options.
H A DAUTHORS39 Assigns diff3.
90 diff3.c, getopt.c, getopt1.c, regex.c, sdiff.c, util.c, xmalloc.c;
H A DREADME3 This directory contains the GNU diff, diff3, sdiff, and cmp utilities.
/freebsd-14.2/tools/build/options/
H A DWITHOUT_GNU_DIFF2 .Xr diff3 1 .
H A DWITH_GNU_DIFF2 .Xr diff3 1 .
/freebsd-14.2/usr.bin/diff3/
H A DMakefile4 PROG= diff3
/freebsd-14.2/gnu/usr.bin/
H A DMakefile5 SUBDIR.${MK_GNU_DIFF}+= diff3
/freebsd-14.2/contrib/diff/doc/
H A Ddiff.texi42 * diff3: (diff)Invoking diff3. Compare 3 files line by line.
1965 @ref{diff3 Merging}).
1972 @xref{Invoking diff3}, for more information on how to run @command{diff3}.
1975 * Sample diff3 Input:: Sample @command{diff3} input for examples.
1981 @node Sample diff3 Input
2085 @node diff3 Hunks
2129 @node diff3 Merging
2267 given the sample input files (@pxref{Sample diff3 Input}), @samp{diff3
3934 @node Invoking diff3
3954 * diff3 Options:: Summary of options to @command{diff3}.
[all …]
/freebsd-14.2/targets/pseudo/userland/gnu/
H A DMakefile.depend22 gnu/usr.bin/diff3 \
/freebsd-14.2/contrib/diff/src/
H A Ddiff3.c222 struct diff3_block *diff3; in main() local
379 diff3 = make_3way_diff (thread0, thread1); in main()
382 = output_diff3_edscript (stdout, diff3, mapping, rev_mapping, in main()
389 = output_diff3_merge (stdin, stdout, diff3, mapping, rev_mapping, in main()
396 output_diff3 (stdout, diff3, mapping, rev_mapping); in main()
/freebsd-14.2/usr.sbin/etcupdate/
H A Detcupdate.sh875 diff3 -E -m ${DESTDIR}$1 ${OLDTREE}$1 ${NEWTREE}$1 > /dev/null 2>&3
884 diff3 -E -m ${DESTDIR}$1 ${OLDTREE}$1 ${NEWTREE}$1 > ${temp}
898 diff3 -m -L "yours" -L "original" -L "new" \
/freebsd-14.2/etc/mtree/
H A DBSD.tests.dist1054 diff3
/freebsd-14.2/usr.sbin/crunch/examples/
H A Dreally-big.conf111 progs bc cpio diff diff3 gas gawk grep gzip sdiff sort tar
/freebsd-14.2/targets/pseudo/tests/
H A DMakefile.depend328 usr.bin/diff3/tests \
/freebsd-14.2/usr.sbin/freebsd-update/
H A Dfreebsd-update.sh2517 if ! diff3 -E -m -L "current version" \
/freebsd-14.2/tools/build/mk/
H A DOptionalObsoleteFiles.inc2090 OLD_FILES+=usr/bin/diff3
2091 OLD_FILES+=usr/share/man/man1/diff3.1.gz