10564b1175
groff 1.23.0 added .MR to its -man macro package. The NEWS file states
that the inclusion of the macro "was prompted by its introduction to
Plan 9 from User Space's troff in August 2020." From d32deab it seems
that the name for Plan 9 from User Space's implementation was suggested
by groff maintainer G. Brandon Robinson.
Not sure if the intention was to make these definitions compatible, but
it would be nice if they were.
Currently, Plan 9 from User Space's .MR expects its second argument to
be parenthesized. groff's .MR does not. This results in extra
parentheses appearing in manual references when viewing Plan 9 from User
Space's manual pages on a system using groff.
74 lines
909 B
Groff
74 lines
909 B
Groff
.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
|
|
.I file2
|
|
onto standard output.
|
|
Wherever
|
|
.I file1
|
|
and
|
|
.I file2
|
|
differ,
|
|
.I idiff
|
|
displays the differences in the style of
|
|
.RB `` diff
|
|
.BR -n ''
|
|
on standard error
|
|
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
|
|
.MR diff 1
|
|
to compare the files.
|
|
The
|
|
.B -b
|
|
and
|
|
.B -w
|
|
flags,
|
|
if passed,
|
|
are
|
|
passed to
|
|
.IR diff .
|
|
.SH FILES
|
|
.B /tmp/idiff.*
|
|
.SH SOURCE
|
|
.B \*9/src/cmd/idiff.c
|
|
.SH "SEE ALSO
|
|
.MR diff 1
|
|
.br
|
|
Kernighan and Pike,
|
|
.IR "The Unix Programming Environment" ,
|
|
Prentice-Hall, 1984.
|