Date: Fri, 03 Jul 2009 12:17:28 +0200 From: Dominic Fandrey <kamikaze@bsdforen.de> To: Cristiano Deana <cristiano.deana@gmail.com> Cc: FreeBSD Stable Mailing List <freebsd-stable@freebsd.org> Subject: Re: mergemaster merge left/right Message-ID: <4A4DDAB8.3080804@bsdforen.de> In-Reply-To: <d8a4930a0907030234v7359642ehe0cf2a86ad7ef6d4@mail.gmail.com> References: <4A4DC67C.3010804@bsdforen.de> <d8a4930a0907030234v7359642ehe0cf2a86ad7ef6d4@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Cristiano Deana wrote: > 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. I don't have to merge files all that often. mergmaster is pretty easy to use, apart from the lack of that information. It wouldn't be very hard to print "<old file> | <new file>" at the beginning of a merge.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4A4DDAB8.3080804>