Date: Sun, 18 Nov 2007 13:01:56 +0100 From: Peter Schuller <peter.schuller@infidyne.com> To: freebsd-questions@freebsd.org Cc: RW <fbsd06@mlists.homeunix.com> Subject: Re: sysutils/etcmerge vs mergemaster Message-ID: <200711181302.05161.peter.schuller@infidyne.com> In-Reply-To: <20071117140337.513fb3e3@gumby.homeunix.com.> References: <200711171116.06705.peter.schuller@infidyne.com> <20071117140337.513fb3e3@gumby.homeunix.com.>
next in thread | previous in thread | raw e-mail | index | archive | help
--nextPart239170124.sgB9TK3S7U Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline > Isn't that what the -U option in mergemaster does? > > > -U Attempt to auto upgrade files that have not been user > modified. I believe I tried this once and it did not make a difference, but I didn't= =20 investigate. Perhaps I screwed up. But even so, three-way merging is nice, so etcmerge remains interesting. Thanks, =2D-=20 / Peter Schuller PGP userID: 0xE9758B7D or 'Peter Schuller <peter.schuller@infidyne.com>' Key retrieval: Send an E-Mail to getpgpkey@scode.org E-Mail: peter.schuller@infidyne.com Web: http://www.scode.org --nextPart239170124.sgB9TK3S7U Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.4 (FreeBSD) iD8DBQBHQCm9DNor2+l1i30RAjcIAKDK32ldiBOCuLYG+M0wtPhYFGl1JwCgrLk2 67OL67VtNTu86kiaflgA5zQ= =uMyZ -----END PGP SIGNATURE----- --nextPart239170124.sgB9TK3S7U--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200711181302.05161.peter.schuller>