1.\" $OpenBSD: merge.1,v 1.3 2010/10/28 15:08:50 jmc Exp $ 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 $Mdocdate: October 28 2010 $ 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 29The 30.Nm 31program merges changes leading from 32.Ar file2 33to 34.Ar file3 35into 36.Ar file1 . 37.Pp 38The following options are supported: 39.Bl -tag -width Ds 40.It Fl E 41Default merge: 42see 43.Xr diff3 1 44for details. 45.It Fl e 46Same as 47.Fl E 48but does not warn about conflicts. 49.It Fl L Ar label 50Specifies labels to be used in place of corresponding file names 51in conflict reports. 52May be given up to three times. 53.It Fl p 54Print result to standard output. 55.It Fl q 56Be quiet about reporting. 57.It Fl V 58Print RCS's version number. 59.El 60.Sh EXAMPLES 61Using labels: 62.Bd -literal -offset indent 63$ merge -q -p -L one -L two -L three file1 file2 file3 64<<<<<<< one 65======= 66bar 67>>>>>>> three 68.Ed 69.Sh DIAGNOSTICS 70The 71.Nm 72utility exits with one of the following values: 73.Pp 74.Bl -tag -width Ds -compact -offset indent 75.It 0 76No overlaps. 77.It 1 78Overlaps were found. 79.It 2 80An 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 88The flag 89.Op Fl A 90has no effect and is provided 91for compatibility only. 92