WebSVN – planix.SVN – Blame – /os/branches/feature-vt/sys/man/1/idiff

Rev	Author	Line No.	Line
2	-	1	`.TH IDIFF 1`
		2	`.SH NAME`
		3	`idiff \- interactive diff`
		4	`.SH SYNOPSIS`
		5	`.B idiff`
		6	`[`
		7	`.B -bw`
		8	`]`
		9	`.I file1`
		10	`.I file2`
		11	`.SH DESCRIPTION`
		12	`.I Idiff`
		13	`interactively`
		14	`merges`
		15	`.I file1`
		16	`and`
		17	`.I file2`
		18	`onto standard output.`
		19	`Wherever`
		20	`.I file1`
		21	`and`
		22	`.I file2`
		23	`differ,`
		24	`.I idiff`
		25	`displays the differences in the style of`
		26	.RB `` diff
		27	`.BR -n ''`
		28	`on standard error`
		29	`and prompts the user to select a chunk.`
		30	`Valid responses are:`
		31	`.TP`
		32	`.B <`
		33	`Use the chunk from`
		34	`.IR file1 .`
		35	`.TP`
		36	`.B >`
		37	`Use the chunk from`
		38	`.IR file2 .`
		39	`.TP`
		40	`.B =`
		41	`Use the diff output itself.`
		42	`.TP`
		43	`.BR q< ", " q> ", " q=`
		44	`Use the given response for all future questions.`
		45	`.TP`
		46	`.BI ! cmd`
		47	`Execute`
		48	`.I cmd`
		49	`and prompt again.`
		50	`.PP`
		51	`.I Idiff`
		52	`invokes`
		53	`.IR diff (1)`
		54	`to compare the files.`
		55	`The`
		56	`.B -b`
		57	`and`
		58	`.B -w`
		59	`flags,`
		60	`if passed,`
		61	`are`
		62	`passed to`
		63	`.IR diff .`
		64	`.SH FILES`
		65	`.B /tmp/idiff.*`
		66	`.SH SOURCE`
		67	`.B /sys/src/cmd/idiff.c`
		68	`.SH "SEE ALSO`
		69	`.IR diff (1)`
		70	`.br`
		71	`Kernighan and Pike,`
		72	`.IR "The Unix Programming Environment" ,`
		73	`Prentice-Hall, 1984.`

Subversion Repositories planix.SVN