Package: rcs Version: 5.7-22 Severity: minor Tags: patch File: /usr/share/man/man1/merge.1.gz
--- /usr/share/man/man1/merge.1.gz +++ /tmp/merge1.gz.20512 2008-03-16 17:25:01.000000000 -0400 @@ -2,7 +2,7 @@ .ds Rv \\$3 .ds Dt \\$4 .. -.Id $Id: merge.1,v 5.7 1995/06/01 16:23:43 eggert Exp $ +.Id $Id: merge.1,v 5.7 2008/03/16 16:23:43 eggert Exp $ .TH MERGE 1 \*(Dt GNU .SH NAME merge \- three-way file merge @@ -114,8 +114,9 @@ .TP .BI \-q Quiet; do not warn about conflicts. +.TP .BI \-V -Print \*r's version number. +Print version number. .SH DIAGNOSTICS Exit status is 0 for no conflicts, 1 for some conflicts, 2 for trouble. .SH IDENTIFICATION @@ -127,7 +128,10 @@ .br Copyright \(co 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert. .SH SEE ALSO -diff3(1), diff(1), rcsmerge(1), co(1). +.BR diff3 (1), +.BR diff (1), +.BR rcsmerge (1), +.BR co(1) . .SH BUGS It normally does not make sense to merge binary files as if they were text, but .B merge -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
