From owner-freebsd-stable@FreeBSD.ORG Fri Jul 3 10:03:24 2009 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2768E106564A for ; Fri, 3 Jul 2009 10:03:24 +0000 (UTC) (envelope-from cristiano.deana@gmail.com) Received: from mail-ew0-f213.google.com (mail-ew0-f213.google.com [209.85.219.213]) by mx1.freebsd.org (Postfix) with ESMTP id 8903C8FC15 for ; Fri, 3 Jul 2009 10:03:23 +0000 (UTC) (envelope-from cristiano.deana@gmail.com) Received: by ewy9 with SMTP id 9so2419540ewy.43 for ; Fri, 03 Jul 2009 03:03:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:content-type :content-transfer-encoding; bh=g4tqYbnUN52T0IwbJXoBtbmZCpzMt+il0evCC74OeB4=; b=t8wR0tHntVc8U53CzpFyXimYVNYGDQJMgk6dldCoIWToaaTNj8m/jZPuPuEgbOyU76 oa/EYGREK0L5pICw12VIvUaACr+GDDBm1xn7m8Tsi5IUbsrVzQI+rnJ7k09YwSsBJ9re Wd5mRL2z5XY2CAvXrUffdUaL4ZkFcCK9EwKzI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type:content-transfer-encoding; b=GjQgKHNEj3rDXtdfPBwxZt4+4/GzJwZ0lJwQRGvJPW2klKKunnuhoAG1mF8vvWo1qq FkY6FL1LtE4Z6AMStaTHBz1+yfdhAK+/Eflh+6Vwtzgz2U9XJZls737FQjnBJoxEkfky i4JkYpMxjc6ioVwYVhsd4Y2yNwQJ+IcKoRTiA= MIME-Version: 1.0 Received: by 10.216.28.200 with SMTP id g50mr290385wea.203.1246613648238; Fri, 03 Jul 2009 02:34:08 -0700 (PDT) In-Reply-To: <4A4DC67C.3010804@bsdforen.de> References: <4A4DC67C.3010804@bsdforen.de> Date: Fri, 3 Jul 2009 11:34:08 +0200 Message-ID: From: Cristiano Deana To: FreeBSD Stable Mailing List Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: mergemaster merge left/right X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jul 2009 10:03:24 -0000 On Fri, Jul 3, 2009 at 10:51 AM, 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. "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/