![[BACK]](/icons/back.gif){kind=icon}
Return to rcsmerge.1 CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / rcs|
Return to rcsmerge.1 CVS log | Up to [local] / src / usr.bin / rcs |
| version 1.7, 2006/04/24 08:18:06 | version 1.8, 2006/04/24 13:32:10 | ||
|---|---|---|---|
|
|
||
| .Nd merge RCS revisions | .Nd merge RCS revisions | ||
| .Sh SYNOPSIS | .Sh SYNOPSIS | ||
| .Nm | .Nm | ||
| .Op Fl AEeV | .Op Fl EeV | ||
| .Op Fl k Ns Ar mode | .Op Fl k Ns Ar mode | ||
| .Op Fl p Ns Op Ar rev | .Op Fl p Ns Op Ar rev | ||
| .Op Fl q Ns Op Ar rev | .Op Fl q Ns Op Ar rev | ||
|
|
||
| .Pp | .Pp | ||
| The following options are supported: | The following options are supported: | ||
| .Bl -tag -width Ds | .Bl -tag -width Ds | ||
| .It Fl A | |||
| Most verbose output. | |||
| .It Fl E | .It Fl E | ||
| Less information than | Default merge: | ||
| .Fl A . | see | ||
| This is the default. | |||
| See | |||
| .Xr diff3 1 | .Xr diff3 1 | ||
| for details. | for details. | ||
| .It Fl e | .It Fl e | ||
|
|
||
| .Xr rcsdiff 1 , | .Xr rcsdiff 1 , | ||
| .Xr rlog 1 | .Xr rlog 1 | ||
| .Sh STANDARDS | .Sh STANDARDS | ||
| The flag | The flags | ||
| .Op Fl T | .Op Fl AT | ||
| has no effect and is provided | have no effect and are provided | ||
| for compatibility only. | for compatibility only. |