"0 conflicts encountered."

[John A Meinel]

Matthew D. Fuller wrote:
> On Fri, Dec 02, 2005 at 12:00:47PM -0500 I heard the voice of
> Aaron Bentley, and lo! it spake thus:
>> Actually, I liked Brad's suggestion of making it a positive
>> statement, like "All changes were applied successfully".
> 
> "17 revisions were [...]"
> 
> 
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.

John
=:->


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 249 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051202/f7c4f294/attachment.pgp