pebkac, but is it a mergemaster bug?

[Ian Freislich]

Hi

Due to not paying attention my ntp.conf on several of my time servers
was updated (and broken) by mergemaster.  I had the automatic update
options set for files that I had not modified.  My ntp.conf had no
VCS id and the files differed, obviously.

Was mergemaster correct in its assesment that this file was a
candidate for automatic installation?

	-U	Attempt to auto upgrade files that have not been 
		user modified

Ian

--
Ian Freislich