![[BACK]](/icons/back.gif){kind=icon}
Return to merge.1 CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / rcs|
Return to merge.1 CVS log | Up to [local] / src / usr.bin / rcs |
| version 1.2, 2007/05/31 19:20:15 | version 1.3, 2010/10/28 15:08:50 | ||
|---|---|---|---|
|
|
||
| but does not warn about conflicts. | but does not warn about conflicts. | ||
| .It Fl L Ar label | .It Fl L Ar label | ||
| Specifies labels to be used in place of corresponding file names | Specifies labels to be used in place of corresponding file names | ||
| in conflicts reports. | in conflict reports. | ||
| May be given up to three times. | May be given up to three times. | ||
| .It Fl p | .It Fl p | ||
| Print result to standard output. | Print result to standard output. |