Date: Fri, 03 Jul 2009 16:25:49 +0200 From: Dominic Fandrey <kamikaze@bsdforen.de> To: Robert Noland <rnoland@FreeBSD.org> Cc: freebsd-stable@freebsd.org Subject: Re: mergemaster merge left/right Message-ID: <4A4E14ED.5010309@bsdforen.de> In-Reply-To: <1246623757.1855.54.camel@balrog.2hip.net> References: <4A4DC67C.3010804@bsdforen.de> <1246623757.1855.54.camel@balrog.2hip.net>
next in thread | previous in thread | raw e-mail | index | archive | help
Robert Noland wrote: > On Fri, 2009-07-03 at 10:51 +0200, Dominic Fandrey wrote: >> I'd really like mergemaster to tell me whether the left >> or the right side is the new file. >> >> # $FreeBSD: src/etc/devd.conf,v 1.38. | # $FreeBSD: src/etc/devd.conf,v 1.38. >> >> Like this I have no idea which one to pick. > > The right hand side is always the new file. I know. Trial and error can tell you that. But I want mergemaster to tell me.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4A4E14ED.5010309>