Giorgos Keramidas wrote: > On 2007-11-17 20:06, Howard Goldstein <[EMAIL PROTECTED]> wrote: >> Giorgos Keramidas wrote: >>> On 2007-11-16 22:34, "J. Porter Clark" <[EMAIL PROTECTED]> 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? >
Yes, please. Could the accompanying .mergemasterrc bits be included in the sample script commented out to keep all the pieces in one place for folks who'll use the example? (Or I suppose an example .mergemasterrc might be include-able (is that a word?)) _______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to "[EMAIL PROTECTED]"
