Home
last modified time | relevance | path

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

/freebsd-13.1/usr.bin/diff3/tests/
H A Ddiff3_test.sh3 atf_test_case diff3
9 diff3 $(atf_get_srcdir)/1.txt $(atf_get_srcdir)/2.txt $(atf_get_srcdir)/3.txt
12 …diff3 --strip-trailing-cr $(atf_get_srcdir)/1cr.txt $(atf_get_srcdir)/2.txt $(atf_get_srcdir)/3.txt
15 diff3 -T $(atf_get_srcdir)/1.txt $(atf_get_srcdir)/2.txt $(atf_get_srcdir)/3.txt
18 diff3 -e $(atf_get_srcdir)/1.txt $(atf_get_srcdir)/2.txt $(atf_get_srcdir)/3.txt
21 diff3 -E -L 1 -L 2 -L 3 $(atf_get_srcdir)/1.txt $(atf_get_srcdir)/2.txt $(atf_get_srcdir)/3.txt
24 diff3 -X -L 1 -L 2 -L 3 $(atf_get_srcdir)/1.txt $(atf_get_srcdir)/2.txt $(atf_get_srcdir)/3.txt
27 diff3 -x $(atf_get_srcdir)/1.txt $(atf_get_srcdir)/2.txt $(atf_get_srcdir)/3.txt
30 diff3 -3 $(atf_get_srcdir)/1.txt $(atf_get_srcdir)/2.txt $(atf_get_srcdir)/3.txt
33 diff3 -i $(atf_get_srcdir)/1.txt $(atf_get_srcdir)/2.txt $(atf_get_srcdir)/3.txt
[all …]
/freebsd-13.1/gnu/usr.bin/diff3/
H A Ddiff3.c.diff2 --- diff3.c.orig 2004-04-12 15:44:35.000000000 +0800
3 +++ diff3.c 2007-06-15 14:49:23.903835977 +0800
H A DMakefile8 PROG= diff3
9 SRCS= diff3.c version-etc.c \
/freebsd-13.1/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-13.1/usr.bin/diff3/
H A DMakefile5 PROG= diff3
/freebsd-13.1/gnu/usr.bin/
H A DMakefile6 SUBDIR.${MK_GNU_DIFF}+= diff3
/freebsd-13.1/usr.bin/svn/lib/libsvn_diff/
H A DMakefile13 diff3.c \
/freebsd-13.1/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-13.1/targets/pseudo/userland/gnu/
H A DMakefile.depend23 gnu/usr.bin/diff3 \
/freebsd-13.1/contrib/diff/src/
H A Ddiff3.c222 struct diff3_block *diff3; in main() local
380 diff3 = make_3way_diff (thread0, thread1); in main()
383 = output_diff3_edscript (stdout, diff3, mapping, rev_mapping, in main()
390 = output_diff3_merge (stdin, stdout, diff3, mapping, rev_mapping, in main()
397 output_diff3 (stdout, diff3, mapping, rev_mapping); in main()
/freebsd-13.1/usr.sbin/etcupdate/
H A Detcupdate.sh830 diff3 -E -m ${DESTDIR}$1 ${OLDTREE}$1 ${NEWTREE}$1 > /dev/null 2>&3
839 diff3 -E -m ${DESTDIR}$1 ${OLDTREE}$1 ${NEWTREE}$1 > ${temp}
853 diff3 -m -A -L "yours" -L "original" -L "new" \
/freebsd-13.1/contrib/subversion/
H A Dbuild.conf1237 [diff-diff3-test]
1238 description = Test the diff/diff3 library
1241 sources = diff-diff3-test.c
1587 diff-diff3-test
1605 diff diff3 diff4 fsfs-access-map
1664 [diff3]
1667 sources = diff3.c
H A DCHANGES444 * diff3: Reduce processing time and memory usage (r1731659)
1492 * new '--conflict-style' option to standalone diff3 tool (r1591750)
1493 * update standalone diff3 tool so it can be used with --diff-cmd
5467 * fixed: invoke external diff/diff3 with local-style paths (r11689)
6674 '..' relative path (#1111), commit/cleanup/diff3 (#1119),
6709 * finish draft of internal diff/diff3 library -- ready for testing/optimizing
6861 - run-time configurable diff/diff3 binary locations (#668)
7101 * switch to 2-part conflict markers (diff3 -E) instead of 3-part (diff3 -A)
7114 * NEW internalized diff/diff3 library. Not yet integrated/tested.
7170 * no more dependency on 'patch'; only on GNU diff3 and some version of 'diff'
[all …]
H A Dbuild-outputs.mk235 diff_diff3_test_DEPS = subversion/tests/libsvn_diff/diff-diff3-test.lo subversion/tests/libsvn_test…
236 diff_diff3_test_OBJECTS = diff-diff3-test.lo
237 subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT): $(diff_diff3_test_DEPS)
241 diff3_DEPS = tools/diff/diff3.lo subversion/libsvn_diff/libsvn_diff-1.la subversion/libsvn_subr/lib…
242 diff3_OBJECTS = diff3.lo
243 tools/diff/diff3$(EXEEXT): $(diff3_DEPS)
244 …cd tools/diff && $(LINK) $(diff3_LDFLAGS) -o diff3$(EXEEXT) $(diff3_OBJECTS) ../../subversion/lib…
460 libsvn_diff_OBJECTS = binary_diff.lo deprecated.lo diff.lo diff3.lo diff4.lo diff_file.lo diff_memo…
1395 cd tools/diff ; $(INSTALL_TOOLS) diff3$(EXEEXT) $(DESTDIR)$(toolsdir)/diff3$(EXEEXT)
1496 diff-diff3-test: subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT)
[all …]
/freebsd-13.1/etc/mtree/
H A DBSD.tests.dist1001 diff3
/freebsd-13.1/usr.sbin/crunch/examples/
H A Dreally-big.conf112 progs bc cpio diff diff3 gas gawk grep gzip sdiff sort tar
/freebsd-13.1/targets/pseudo/tests/
H A DMakefile.depend328 usr.bin/diff3/tests \
/freebsd-13.1/usr.sbin/freebsd-update/
H A Dfreebsd-update.sh2517 if ! diff3 -E -m -L "current version" \
/freebsd-13.1/tools/build/mk/
H A DOptionalObsoleteFiles.inc2322 OLD_FILES+=usr/bin/diff3
2323 OLD_FILES+=usr/share/man/man1/diff3.1.gz