Date: Fri, 3 Jul 2009 11:34:08 +0200 From: Cristiano Deana <cristiano.deana@gmail.com> To: FreeBSD Stable Mailing List <freebsd-stable@freebsd.org> Subject: Re: mergemaster merge left/right Message-ID: <d8a4930a0907030234v7359642ehe0cf2a86ad7ef6d4@mail.gmail.com> In-Reply-To: <4A4DC67C.3010804@bsdforen.de> References: <4A4DC67C.3010804@bsdforen.de>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, Jul 3, 2009 at 10:51 AM, Dominic Fandrey<kamikaze@bsdforen.de> 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. "From" -> "To" The new one is *always* the right one. -- Cris, member of G.U.F.I Italian FreeBSD User Group http://www.gufi.org/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?d8a4930a0907030234v7359642ehe0cf2a86ad7ef6d4>