merge vs pull

[Aaron Bentley]

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

Kevin Smith wrote:
> Ok. So pull should (maybe already does) tell the user if there were
> conflicts, and describe how the user could find them.

It already does.

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

iD8DBQFDjIbY0F+nu1YWqI0RAnWZAJsEse1PNlA4ImzfiSlPmst9DQS10wCff+cu
iRZ6XR5wSN0x/gh48AZzzN8=
=W6tv
-----END PGP SIGNATURE-----