Date: Fri, 03 Jul 2009 07:22:37 -0500 From: Robert Noland <rnoland@FreeBSD.org> To: Dominic Fandrey <kamikaze@bsdforen.de> Cc: freebsd-stable@freebsd.org Subject: Re: mergemaster merge left/right Message-ID: <1246623757.1855.54.camel@balrog.2hip.net> In-Reply-To: <4A4DC67C.3010804@bsdforen.de> References: <4A4DC67C.3010804@bsdforen.de>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-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 <rnoland@FreeBSD.org> 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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1246623757.1855.54.camel>