Take a look ath this diff: --- /etc/nsmb.conf Wed Jan 30 05:31:21 2002 +++ ./etc/nsmb.conf Wed Feb 6 16:20:55 2002 @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/nsmb.conf,v 1.4 2002/01/29 00:23:34 cjc Exp $ +# $FreeBSD: src/etc/nsmb.conf,v 1.3 2002/01/07 08:41:55 sheldonh Exp $ # # smbfs lookups configuration files in next order: # 1. ~/.nsmbrc
[and then, the wise mergemaster asks...] Use 'd' to delete the temporary ./etc/nsmb.conf Use 'i' to install the temporary ./etc/nsmb.conf Use 'm' to merge the temporary and installed versions Use 'v' to view the diff results again [urkkk... how many more to go?] Diffs like there show up for COUNTLESS times in mergemaster. In fact, nothing changed except the cvs id. Why am I asked about these in mergemaster? Is there a way to ignore files that only have the cvsid changed? This would speed up the mergemaster run considerably... Cheers, Emiel To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-current" in the body of the message
