.TH IDIFF 1 .SH NAME idiff \- interactive file comparison .SH SYNOPSIS .B idiff file1 file2 .SH DESCRIPTION .I idiff compares .I file1 with .I file2 using .IR diff , then presents each set of changed lines for selection or processing. .I file2 may be a directory; in that case, the basename of .I file1 is appended. .PP For each group, legal responses are .TP < to retain the `from' lines .TP > to retain the `to' lines .TP e to edit both sets of lines .TP d to delete both sets .TP 1 to retain the rest of the `from' file .TP 2 to retain the rest of the `to' file .TP ! to invoke a shell command .PP Lines common to each file are copied verbatim. Lines produced by this process, including the lines written from within the editor, are written to file .IR idiff.out . .SH FILES idiff.out .br idiff.* .br /tmp/idiff.* .SH SEE ALSO diff(1), diff3(1) .SH BUGS There is no way to revisit a choice.