5c5
< .Id $Id: rcsmerge.1,v 5.3 1991/08/19 03:13:55 eggert Exp $
---
> .Id $Id: rcsmerge.1,v 5.6 1995/06/01 16:23:43 eggert Exp $
40a41,69
> .B \-A
> Output conflicts using the
> .B \-A
> style of
> .BR diff3 (1),
> if supported by
> .BR diff3 .
> This merges all changes leading from
> .I file2
> to
> .I file3
> into
> .IR file1 ,
> and generates the most verbose output.
> .TP
> \f3\-E\fP, \f3\-e\fP
> These options specify conflict styles that generate less information
> than
> .BR \-A .
> See
> .BR diff3 (1)
> for details.
> The default is
> .BR \-E .
> With
> .BR \-e ,
> .B rcsmerge
> does not warn about conflicts.
> .TP
53a83,87
> It normally does not make sense to merge binary files as if they were text, so
> .B rcsmerge
> refuses to merge files if
> .B \-kb
> expansion is used.
67a102,108
> .B \-T
> This option has no effect;
> it is present for compatibility with other \*r commands.
> .TP
> .BI \-V
> Print \*r's version number.
> .TP
81a123,130
> .TP
> .BI \-z zone
> Use
> .I zone
> as the time zone for keyword substitution.
> See
> .BR co (1)
> for details.
126c175
< Revision Number: \*(Rv; Release Date: \*(Dt.
---
> Manual Page Revision: \*(Rv; Release Date: \*(Dt.
128c177
< Copyright \(co 1982, 1988, 1989 by Walter F. Tichy.
---
> Copyright \(co 1982, 1988, 1989 Walter F. Tichy.
130c179
< Copyright \(co 1990, 1991 by Paul Eggert.
---
> Copyright \(co 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert.