Date: Thu, 10 Apr 2003 00:16:48 -0700 (PDT) From: Doug Barton <DougB@FreeBSD.org> To: Garance A Drosihn <drosih@rpi.edu> Cc: Friedemann Becker <friedemann.becker@student.uni-tuebingen.de> Subject: Re: generalized mergemaster(8) Message-ID: <20030410001510.P944@znfgre.tberna.bet> In-Reply-To: <p05200f13bab6b291c0c5@[128.113.24.47]> References: <Pine.LNX.4.30.0304062328500.28875-100000@linux17.zdv.uni-tuebingen.de> <p05200f13bab6b291c0c5@[128.113.24.47]>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, 7 Apr 2003, Garance A Drosihn wrote:
> The mignore will be welcome for /etc/motd, which I never want
> to change.
This is another problem I run into often, that people don't actually
understand what mergemaster is already capable of. :) If you read the man
page, you'll see the following option that you can add to
/etc/mergemaster.rc or ~/.mergemasterrc:
# Don't compare the old and new motd files
#IGNORE_MOTD=yes
--
This .signature sanitized for your protection
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030410001510.P944>