K 10
svn:author
V 3
imp
K 8
svn:date
V 27
1998-10-12T18:53:33.000000Z
K 7
svn:log
V 227
Fix breakage introduced by last patch.  bde has added CC_QUIET flag to
hasseen_isadev so this will be less noisy when conflicts do exist.
Also eliminate redundant warnings about conflicts.

Requested by: bde
Reviewed by: gibbs

END