update output

[Nick Roberts]

Not really a bug, just a suggestion :

Would it be a good idea for `cvs update' to generate a different output for a
merge to that when only the local file is modified ? ME and MO say.  Merges
may be `successful' but still not do what you want them to so they need a bit
more caution. I know that when `cvs update' is run, a file, `.#filename', is
generated. However, this is not evident when exploring with `cvs -n update'.
`cvs status * | grep -i merge' will find which files need a merge but this is
not very elegant.

Nick Roberts