When upgrading a machine to 9.1-PRERELEASE, mergemaster is
painfull, because many quiete recent files are replaced with
files with old ident.
$ ident /etc/hosts /etc/shells /etc/csh.cshrc
$FreeBSD: stable/9/etc/hosts 109997 2003-01-28 21:29:23Z dbaker $
$FreeBSD: stable/9/etc/shells 59717 2000-04-27 21:58:46Z ache $
$FreeBSD: stable/9/etc/csh.cshrc 50472 1999-08-27 23:37:10Z peter $
Force commit of these oldies.
How-To-Repeat: Check ident of many files under /etc.
Disregarding the age of the PR, closing since '-F' should be used if the RCSID is the only change, according to the manual page:
-F If the files differ only by VCS Id ($FreeBSD) install the new
If this is indeed still an issue, please open a new PR, but this is not RE territory IMHO.