"0 conflicts encountered."

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

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 [...]"

It's more like "The differences between X and Y were applied
successfully.  X and Y are 17 revisions apart."  Unlike, say, Darcs, or
Arch, we don't apply individual patches.  We do a three-way merge, and
the inputs are the working tree, the tree for revision X, and the tree
for revision Y.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD4DBQFDkK/Z0F+nu1YWqI0RAhzmAJ9mzn2GsWddAJ7sLqdTnr0RixPlQwCVEtq8
FIeiH8vYxMx4NIE89t6Y4A==
=I+tT
-----END PGP SIGNATURE-----