Date: Sun, 18 Nov 2007 10:35:24 +0200 From: Giorgos Keramidas <keramida@freebsd.org> To: Howard Goldstein <hg@queue.to> Cc: freebsd-questions@freebsd.org Subject: Re: Making mergemaster skip certain files Message-ID: <20071118083524.GB83139@kobe.laptop> In-Reply-To: <473F9002.6040703@queue.to> References: <20071117043426.GA71265@auricle.charter.net> <20071117181156.GC2834@kobe.laptop> <473F9002.6040703@queue.to>
next in thread | previous in thread | raw e-mail | index | archive | help
On 2007-11-17 20:06, Howard Goldstein <hg@queue.to> wrote: > Giorgos Keramidas wrote: > > On 2007-11-16 22:34, "J. Porter Clark" <jpc@porterclark.com> wrote: > > mergemaster for more details, but here's a short description of what I > > use on my laptop for some time now: > > > 1. A `.mergemasterrc' file in the HOME directory of the `root' user, > > which contains: > > [snip] > > > > 2. The `/root/mm-pre-compare.sh' script contains the following: > > [snip] > > Please consider submitting this as a PR in hopes it gets included in > the actual package. Since mergemaster is included in the base system, I can directly commit to its manpage. There is already a description of `.mergemasterrc' in the manpage, so I'm guessing you want a sample script added?
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20071118083524.GB83139>