Home
last modified time | relevance | path

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

/plan9/sys/src/ape/cmd/diff/
H A DNEWS11 * New cmp, diff, diff3, sdiff option: --help
26 * New diff3 option: -T --initial-tab
91 * New diff3 option:
93 * diff3 -m now defaults to -A, not -E.
94 * diff3 now takes up to three -L or --label options, not just two.
122 * New diff3 options:
124 * Add long-named equivalents for other diff3 options.
H A Dmkfile8 TARG=diff diff3
47 $O.diff3: $DIFF3O
H A DChangeLog17 * diff3.c (read_diff): If STAT_BLOCKSIZE yields zero,
51 * diff3.c (main): Give proper diagnostic if too many labels were given.
144 * diff3.c (read_diff): Use new waitpid substitute.
146 * cmp.c, diff.c, diff3.c, sdiff.c (check_stdout, try_help): New fns.
157 * diff.c, diff3.c, (main), sdiff.c (trapsigs): If we'll have children,
160 * diff3.c (DIFF_CHUNK_SIZE): Removed. Get size from STAT_BLOCKSIZE.
172 * cmp.c, diff.c, diff3.c, sdiff.c, (main): Call initialize_main first.
181 * diff3.c (read_diff), sdiff.c (cleanup, main, waitpid),
207 * diff3.c (scan_diff_line), util.c (print_number_range): Don't
263 * diff3.c (usage): Send usage to stdout, not stderr.
[all …]
H A Ddiff.texi9 This file documents the the GNU @code{diff}, @code{diff3}, @code{sdiff},
39 @subtitle @code{diff}, @code{diff3}, @code{sdiff}, @code{cmp}, and @code{patch}
66 This file documents the the GNU @code{diff}, @code{diff3}, @code{sdiff},
83 * diff3 Merging:: Merging from a common ancestor.
90 * Invoking diff3:: How to run @code{diff3} and a summary of its options.
123 You can use the @code{diff3} command to show differences among three
125 original, @code{diff3} can report the differences between the original
164 GNU @code{diff3} was written by Randy Smith. GNU @code{sdiff} was
210 @code{diff3} normally compares three input files line by line, finds
443 If @code{diff3} thinks that any of the files it is comparing is binary
[all …]
H A DREADME1 This directory contains the GNU diff, diff3, sdiff, and cmp utilities.
H A Ddiff3.c236 struct diff3_block *diff3; local
380 diff3 = make_3way_diff (thread0, thread1);
383 = output_diff3_edscript (stdout, diff3, mapping, rev_mapping,
390 = output_diff3_merge (stdin, stdout, diff3, mapping, rev_mapping,
397 output_diff3 (stdout, diff3, mapping, rev_mapping);
/plan9/rc/bin/patch/
H A Dapply36 ape/diff3 -m $1 $2.orig $2 >$2.new