"0 conflicts encountered."

[Matthew D. Fuller]

On Fri, Dec 02, 2005 at 02:01:33PM -0600 I heard the voice of
John A Meinel, and lo! it spake thus:
>
> Well, the revisions are always applied. But you could say:
> 
> 17 revisions were applied successfully
> 17 revisions were applied with 10 conflicts
> 
> But the revisions themselves don't conflict, only the contents of
> the files.

Sure, but people think in revisions (I do, anyway).  "X revisions were
applied with Y conflicts" does seem to pass along a nice quick summary
with enough information to be reassuring without leaving a new user to
ponder what exactly it means.


-- 
Matthew Fuller     (MF4839)   |  fullermd at over-yonder.net
Systems/Network Administrator |  http://www.over-yonder.net/~fullermd/
           On the Internet, nobody can hear you scream.