mergemaster annoyance or not?

[Eugene Grosbein]

On Thu, Mar 12, 2009 at 04:05:27PM +0100, Oliver Fromme wrote:

> This is what I have in my /etc/mergemaster.rc; it will
> probably help in your case:
> 
> DIFF_FLAG='-Bub'
> DIFF_OPTIONS='-I$FreeBSD:.*[$]'
> IGNORE_MOTD=yes

Yes, it helps and I like it. But I'm forced to put it to each and every
box I install; that does not annoy me so much
but other people are annoyed.

> PS:  I think the above options should _not_ be on by
> default, because that would be a POLA violation.
> Those people who want them can easily add them to their
> mergemaster.rc file.

I see this as POLA recovery because there where no such problem
with mergemaster before switch to SVN.

Eugene Grosbein