diff options
| author | rsc <devnull@localhost> | 2004-04-10 18:53:55 +0000 |
|---|---|---|
| committer | rsc <devnull@localhost> | 2004-04-10 18:53:55 +0000 |
| commit | cfa37a7b1131abbab2e7d339b451f5f0e3198cc8 (patch) | |
| tree | a7fe52416e9d27efe2af2d54910112674c0fd7c6 /man/man1/idiff.1 | |
| parent | 08df2a433e69c94f9db002c83380cb2b693fee60 (diff) | |
| download | plan9port-cfa37a7b1131abbab2e7d339b451f5f0e3198cc8.tar.gz plan9port-cfa37a7b1131abbab2e7d339b451f5f0e3198cc8.tar.bz2 plan9port-cfa37a7b1131abbab2e7d339b451f5f0e3198cc8.zip | |
Lots of man pages.
Diffstat (limited to 'man/man1/idiff.1')
| -rw-r--r-- | man/man1/idiff.1 | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/man/man1/idiff.1 b/man/man1/idiff.1 new file mode 100644 index 00000000..5cb22600 --- /dev/null +++ b/man/man1/idiff.1 @@ -0,0 +1,72 @@ +.TH IDIFF 1 +.SH NAME +idiff \- interactive diff +.SH SYNOPSIS +.B idiff +[ +.B -bw +] +.I file1 +.I file2 +.SH DESCRIPTION +.I Idiff +interactively +merges +.I file1 +and +.IR file2 . +Wherever +.I file1 +and +.I file2 +differ, +.I idiff +displays the differences in the style of +.RB `` diff +.RB -n '' +and prompts the user to select a chunk. +Valid responses are: +.TP +.B < +Use the chunk from +.IR file1 . +.TP +.B > +Use the chunk from +.IR file2 . +.TP +.B = +Use the diff output itself. +.TP +.BR q< ", " q> ", " q= +Use the given response for all future questions. +.TP +.BI ! cmd +Execute +.I cmd +and prompt again. +.PP +.I Idiff +invokes +.IR diff (1) +to compare the files. +The +.B -b +and +.B -w +flags +are simply +passed through to +.IR diff . +.SH FILES +.B /tmp/idiff.* +.SH SOURCE +.B /sys/src/cmd/idiff.c +.SH "SEE ALSO +.IR diff (1) +.br +Kernighan and Pike, +.IR "The Unix Programming Environment" , +Prentice-Hall, 1984. +.SH BUGS +This is a poorly-written manual page. |