Return to merge.1 CVS log

Up to [local] / src / usr.bin / rcs

Annotation of src/usr.bin/rcs/merge.1, Revision 1.1

1.1     ! xsa         1: .\"    $OpenBSD$
        !             2: .\"
        !             3: .\" Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org>
        !             4: .\" All rights reserved.
        !             5: .\"
        !             6: .\" Permission to use, copy, modify, and distribute this software for any
        !             7: .\" purpose with or without fee is hereby granted, provided that the above
        !             8: .\" copyright notice and this permission notice appear in all copies.
        !             9: .\"
        !            10: .\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
        !            11: .\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
        !            12: .\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
        !            13: .\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
        !            14: .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
        !            15: .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
        !            16: .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
        !            17: .Dd May 09, 2006
        !            18: .Dt MERGE 1
        !            19: .Os
        !            20: .Sh NAME
        !            21: .Nm merge
        !            22: .Nd 3-way file merge
        !            23: .Sh SYNOPSIS
        !            24: .Nm
        !            25: .Op Fl EepqV
        !            26: .Op Fl L Ar label
        !            27: .Ar file1 file2 file3
        !            28: .Sh DESCRIPTION
        !            29: The
        !            30: .Nm
        !            31: program merges changes leading from
        !            32: .Ar file2
        !            33: to
        !            34: .Ar file3
        !            35: into
        !            36: .Ar file1 .
        !            37: .Pp
        !            38: The following options are supported:
        !            39: .Bl -tag -width Ds
        !            40: .It Fl E
        !            41: Default merge:
        !            42: see
        !            43: .Xr diff3 1
        !            44: for details.
        !            45: .It Fl e
        !            46: Same as
        !            47: .Fl E
        !            48: but does not warn about conflicts.
        !            49: .It Fl L Ar label
        !            50: Specifies labels to be used in place of corresponding file names
        !            51: in conflicts reports.
        !            52: May be given up to three times.
        !            53: .It Fl p
        !            54: Print result to standard output.
        !            55: .It Fl q
        !            56: Be quiet about reporting.
        !            57: .It Fl V
        !            58: Print RCS's version number.
        !            59: .El
        !            60: .Sh EXAMPLES
        !            61: Using labels:
        !            62: .Bd -literal -offset indent
        !            63: $ merge -q -p -L one -L two -L three file1 file2 file3
        !            64: <<<<<<< one
        !            65: =======
        !            66: bar
        !            67: >>>>>>> three
        !            68: .Ed
        !            69: .Sh DIAGNOSTICS
        !            70: The
        !            71: .Nm
        !            72: utility exits with one of the following values:
        !            73: .Pp
        !            74: .Bl -tag -width Ds -compact -offset indent
        !            75: .It 0
        !            76: No overlaps.
        !            77: .It 1
        !            78: Overlaps were found.
        !            79: .It 2
        !            80: An error occurred.
        !            81: .El
        !            82: .Sh SEE ALSO
        !            83: .Xr co 1 ,
        !            84: .Xr diff 1 ,
        !            85: .Xr diff3 1 ,
        !            86: .Xr rcsmerge 1
        !            87: .Sh STANDARDS
        !            88: The flag
        !            89: .Op Fl A
        !            90: has no effect and is provided
        !            91: for compatibility only.