From owner-freebsd-stable@FreeBSD.ORG Fri Jul 3 12:22:49 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 DF9AD1065676 for ; Fri, 3 Jul 2009 12:22:49 +0000 (UTC) (envelope-from rnoland@FreeBSD.org) Received: from gizmo.2hip.net (gizmo.2hip.net [64.74.207.195]) by mx1.freebsd.org (Postfix) with ESMTP id A38E58FC16 for ; Fri, 3 Jul 2009 12:22:49 +0000 (UTC) (envelope-from rnoland@FreeBSD.org) Received: from [192.168.1.4] (adsl-146-138-56.bna.bellsouth.net [70.146.138.56]) (authenticated bits=0) by gizmo.2hip.net (8.14.3/8.14.3) with ESMTP id n63CMh1J024450 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 3 Jul 2009 08:22:43 -0400 (EDT) (envelope-from rnoland@FreeBSD.org) From: Robert Noland To: Dominic Fandrey In-Reply-To: <4A4DC67C.3010804@bsdforen.de> References: <4A4DC67C.3010804@bsdforen.de> Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-18SxHsZM7kyA6+mTEHRT" Organization: FreeBSD Date: Fri, 03 Jul 2009 07:22:37 -0500 Message-Id: <1246623757.1855.54.camel@balrog.2hip.net> Mime-Version: 1.0 X-Mailer: Evolution 2.26.2 FreeBSD GNOME Team Port X-Spam-Status: No, score=-1.8 required=5.0 tests=AWL,BAYES_00,RCVD_IN_PBL, RDNS_DYNAMIC,SPF_SOFTFAIL autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on gizmo.2hip.net Cc: freebsd-stable@freebsd.org 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 12:22:50 -0000 --=-18SxHsZM7kyA6+mTEHRT Content-Type: text/plain Content-Transfer-Encoding: quoted-printable 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. >=20 > # $FreeBSD: src/etc/devd.conf,v 1.38. | # $FreeBSD: src/etc/devd.conf,v 1= .38. >=20 > Like this I have no idea which one to pick. The right hand side is always the new file. robert. > _______________________________________________ > freebsd-stable@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-stable > To unsubscribe, send any mail to "freebsd-stable-unsubscribe@freebsd.org" --=20 Robert Noland FreeBSD --=-18SxHsZM7kyA6+mTEHRT Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (FreeBSD) iEYEABECAAYFAkpN+A0ACgkQM4TrQ4qfROMZiwCeJsMljgZB6UBsYn1H1Crdv2/1 2jIAn1V64GhgEMP60Uf6iIadIcBHiTp4 =6r7u -----END PGP SIGNATURE----- --=-18SxHsZM7kyA6+mTEHRT--