diff options
Diffstat (limited to 'man/man1/idiff.html')
| -rw-r--r-- | man/man1/idiff.html | 87 |
1 files changed, 87 insertions, 0 deletions
diff --git a/man/man1/idiff.html b/man/man1/idiff.html new file mode 100644 index 00000000..15296a37 --- /dev/null +++ b/man/man1/idiff.html @@ -0,0 +1,87 @@ +<head> +<title>idiff(1) - Plan 9 from User Space</title> +<meta content="text/html; charset=utf-8" http-equiv=Content-Type> +</head> +<body bgcolor=#ffffff> +<table border=0 cellpadding=0 cellspacing=0 width=100%> +<tr height=10><td> +<tr><td width=20><td> +<tr><td width=20><td><b>IDIFF(1)</b><td align=right><b>IDIFF(1)</b> +<tr><td width=20><td colspan=2> + <br> +<p><font size=+1><b>NAME </b></font><br> + +<table border=0 cellpadding=0 cellspacing=0><tr height=2><td><tr><td width=20><td> + + idiff – interactive diff<br> + +</table> +<p><font size=+1><b>SYNOPSIS </b></font><br> + +<table border=0 cellpadding=0 cellspacing=0><tr height=2><td><tr><td width=20><td> + + <tt><font size=+1>idiff</font></tt> [ <tt><font size=+1>−bw</font></tt> ] <i>file1 file2<br> + </i> +</table> +<p><font size=+1><b>DESCRIPTION </b></font><br> + +<table border=0 cellpadding=0 cellspacing=0><tr height=2><td><tr><td width=20><td> + + <i>Idiff</i> interactively merges <i>file1</i> and <i>file2</i> onto standard output. + Wherever <i>file1</i> and <i>file2</i> differ, <i>idiff</i> displays the differences + in the style of “<tt><font size=+1>diff −n</font></tt>” on standard error and prompts the user + to select a chunk. Valid responses are:<br> + <tt><font size=+1><</font></tt> Use the chunk from <i>file1</i>.<br> + <tt><font size=+1>></font></tt> Use the chunk from <i>file2</i>.<br> + <tt><font size=+1>=</font></tt> Use the diff output itself.<br> + <tt><font size=+1>q<</font></tt>, <tt><font size=+1>q></font></tt>, <tt><font size=+1>q=<br> + </font></tt> + <table border=0 cellpadding=0 cellspacing=0><tr height=2><td><tr><td width=20><td> + + Use the given response for all future questions.<br> + + </table> + <tt><font size=+1>!</font></tt><i>cmd</i>Execute <i>cmd</i> and prompt again. + <table border=0 cellpadding=0 cellspacing=0><tr height=5><td></table> + + <i>Idiff</i> invokes <a href="../man1/diff.html"><i>diff</i>(1)</a> to compare the files. The <tt><font size=+1>−b</font></tt> and <tt><font size=+1>−w</font></tt> flags, + if passed, are passed to <i>diff</i>.<br> + +</table> +<p><font size=+1><b>FILES </b></font><br> + +<table border=0 cellpadding=0 cellspacing=0><tr height=2><td><tr><td width=20><td> + + <tt><font size=+1>/tmp/idiff.*<br> + </font></tt> +</table> +<p><font size=+1><b>SOURCE </b></font><br> + +<table border=0 cellpadding=0 cellspacing=0><tr height=2><td><tr><td width=20><td> + + <tt><font size=+1>/usr/local/plan9/src/cmd/idiff.c<br> + </font></tt> +</table> +<p><font size=+1><b>SEE ALSO </b></font><br> + +<table border=0 cellpadding=0 cellspacing=0><tr height=2><td><tr><td width=20><td> + + <a href="../man1/diff.html"><i>diff</i>(1)</a><br> + Kernighan and Pike, <i>The Unix Programming Environment</i>, Prentice-Hall, + 1984.<br> + +</table> + +<td width=20> +<tr height=20><td> +</table> +<!-- TRAILER --> +<table border=0 cellpadding=0 cellspacing=0 width=100%> +<tr height=15><td width=10><td><td width=10> +<tr><td><td> +<center> +<a href="../../"><img src="../../dist/spaceglenda100.png" alt="Space Glenda" border=1></a> +</center> +</table> +<!-- TRAILER --> +</body></html> |